[Libreoffice-commits] core.git: filter/source

[krishna keshav]

 filter/source/msfilter/msvbahelper.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7a11763823eef04e9602c7de3fff44415061d7cb
Author: krishna keshav <princy.krishnakeshav at gmail.com>
Date:   Fri Jun 3 22:13:35 2016 +0530

    tdf#99589 tolower / toupper - dangerous to Turks ...
    
    used 'toAsciiUpperCase()' and 'isAsciiUpperCase()' from rtl/character.hxx
    
    Change-Id: Iafbf97c4e2f026443411cf080ba2f0872b726bbe
    Reviewed-on: https://gerrit.libreoffice.org/25877
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index a06eb5c..49e6190 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -34,6 +34,7 @@
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 #include <unotools/pathoptions.hxx>
+#include<rtl/character.hxx>
 
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <svtools/acceleratorexecute.hxx>
@@ -630,8 +631,8 @@ sal_uInt16 parseChar( char c ) throw ( uno::RuntimeException )
     // do we care about locale here for isupper etc. ? probably not
     if ( isalpha( c ) )
     {
-        nVclKey |= ( toupper( c ) - 'A' ) + KEY_A;
-        if ( isupper( c ) )
+        nVclKey |= ( rtl::toAsciiUpperCase( c ) - 'A' ) + KEY_A;
+        if ( rtl::isAsciiUpperCase( c ) )
             nVclKey |= KEY_SHIFT;
     }
     else if ( isdigit( c ) )