[Libreoffice-commits] core.git: basic/source helpcompiler/source

[Krishna Keshav]

 basic/source/comp/symtbl.cxx         |    3 ++-
 helpcompiler/source/HelpCompiler.cxx |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 26d314d2e25945941d49a4872d7ffa27cfc2fdc8
Author: Krishna Keshav <princy.krishnakeshav at gmail.com>
Date:   Sat May 7 01:55:23 2016 +0530

    tdf#99589 tolower / toupper - dangerous to Turks ...
    
    Used toAsciiUpperCase() from character.hxx
    
    Change-Id: I79f4638866daf8952103c8a521db925150e8dcda
    Reviewed-on: https://gerrit.libreoffice.org/24709
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 94f1be3..f7e6016 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+#include <rtl/character.hxx>
 
 // All symbol names are laid down int the symbol-pool's stringpool, so that
 // all symbols are handled in the same case. On saving the code-image, the
@@ -326,7 +327,7 @@ void SbiSymDef::SetType( SbxDataType t )
             {
                 ch = 'Z';
             }
-            int ch2 = toupper( ch );
+            int ch2 = rtl::toAsciiUpperCase( ch );
             int nIndex = ch2 - 'A';
             if (nIndex >= 0 && nIndex < N_DEF_TYPES)
                 t = pIn->pParser->eDefTypes[nIndex];
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 91458e0..4f391b6 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -29,6 +29,7 @@
 #include <libxslt/xsltutils.h>
 #include <osl/thread.hxx>
 #include <chrono>
+#include<rtl/character.hxx>
 
 static void impl_sleep( sal_uInt32 nSec )
 {
@@ -462,7 +463,7 @@ bool HelpCompiler::compile()
     std::string appl = module.substr(1);
     for (char & i : appl)
     {
-        i=toupper(i);
+        i=rtl::toAsciiUpperCase(i);
     }
     xmlNodePtr docResolved = clone(xmlDocGetRootElement(docResolvedOrg), appl);
     myparser aparser(documentId, fileName, title);