[Libreoffice-commits] core.git: l10ntools/source lingucomponent/source
Krishna Keshav
princy.krishnakeshav at gmail.com
Tue May 10 15:25:41 UTC 2016
l10ntools/source/gL10nMem.cxx | 3 ++-
lingucomponent/source/languageguessing/altstrfunc.cxx | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 1fcd8dfb70124acc935c24e066dfd3e2144baec9
Author: Krishna Keshav <princy.krishnakeshav at gmail.com>
Date: Thu May 5 23:28:29 2016 +0530
tdf#99589 tolower / toupper - dangerous to Turks ...
replaced tolower with to AsciiLowerCase() in
lingucomponent/source/languageguessing/altstrfunc.cxx
l10ntools/source/gL10nMem.cxx
Change-Id: I1340da18b263a4a921e2e8d96c0f133fe300086e
Reviewed-on: https://gerrit.libreoffice.org/24682
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/l10ntools/source/gL10nMem.cxx b/l10ntools/source/gL10nMem.cxx
index 62c924a..2662121 100644
--- a/l10ntools/source/gL10nMem.cxx
+++ b/l10ntools/source/gL10nMem.cxx
@@ -21,6 +21,7 @@
#include <iostream>
#include <fstream>
#include <sstream>
+#include<rtl/character.hxx>
using namespace std;
#include "gL10nMem.hxx"
@@ -977,6 +978,6 @@ void l10nMem::keyToLower(string& sKey)
if (ch == ' ' || ch == '*' || ch == '+' || ch == '%')
sKey[i] = '_';
else
- sKey[i] = tolower(ch);
+ sKey[i] = toAsciiLowerCase(ch);
}
}
diff --git a/lingucomponent/source/languageguessing/altstrfunc.cxx b/lingucomponent/source/languageguessing/altstrfunc.cxx
index 1fb2943..a155ee0 100644
--- a/lingucomponent/source/languageguessing/altstrfunc.cxx
+++ b/lingucomponent/source/languageguessing/altstrfunc.cxx
@@ -20,6 +20,9 @@
#include "altstrfunc.hxx"
#include <sal/types.h>
+#include<rtl/character.hxx>
+
+using namespace rtl;
int start(const std::string &s1, const std::string &s2){
size_t i;
@@ -30,7 +33,7 @@ int start(const std::string &s1, const std::string &s2){
min = s2.length();
for(i = 0; i < min && s2[i] && s1[i] && !ret; i++){
- ret = toupper(s1[i]) - toupper(s2[i]);
+ ret = toAsciiUpperCase(s1[i]) - toAsciiUpperCase(s2[i]);
if(s1[i] == '.' || s2[i] == '.'){ret = 0;}//. is a neutral character
}
return ret;
More information about the Libreoffice-commits
mailing list