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

[Stephan Bergmann]

 cui/source/dialogs/about.cxx      |    3 +--
 filter/source/t602/t602filter.cxx |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit f512cf5b1bf9e80cb430c1f06fbb7d86feb19ca3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Mar 22 21:44:16 2017 +0100

    Use rtl::isAscii* instead of ctype.h is* with sal_Unicode arg
    
    Change-Id: Ifcc531df2b780e446dd4c2cccf74fa902ab4a259

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index d1c5986572d3..72a21d78c51c 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -49,7 +49,6 @@
 #include <sfx2/app.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/bitmap.hxx>
-#include <cctype>
 
 #if HAVE_FEATURE_OPENCL
 #include <opencl/openclwrapper.hxx>
@@ -297,7 +296,7 @@ bool AboutDialog::IsStringValidGitHash(const OUString& hash)
 {
     for (int i = 0; i < hash.getLength(); i++)
     {
-        if (!std::isxdigit(hash[i]))
+        if (!rtl::isAsciiHexDigit(hash[i]))
         {
             return false;
         }
commit dccbd373c9517a917c9d2be5d5abd6640948059a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Mar 22 21:43:43 2017 +0100

    Use rtl::isAscii* instead of ctype.h is*
    
    Change-Id: I3fc3db1cc2de49ebe5492fc7dae26b71aece3c6b

diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 03f8beddaf4f..20398237294d 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -678,7 +678,7 @@ tnode T602ImportFilter::PointCmd602(unsigned char *ch)
     *ch = Readchar602();
     if (!*ch) return tnode::EEND;
     if (*ch=='\n') return tnode::EOL;
-    if (!isalpha(*ch)) return (*ch<32) ? tnode::SETCH : tnode::WRITE;
+    if (!rtl::isAsciiAlpha(*ch)) return (*ch<32) ? tnode::SETCH : tnode::WRITE;
 
     // warning: uChar -> char
     pcmd[1] = (char) rtl::toAsciiUpperCase(*ch); inschr(*ch);
@@ -749,7 +749,7 @@ void T602ImportFilter::Read602()
         case tnode::POCMD: inschr('.');
             ch = Readchar602();
             if(ch == 0) node = tnode::EEND;
-            else if(isalpha(ch)) node = PointCmd602(&ch);
+            else if(rtl::isAsciiAlpha(ch)) node = PointCmd602(&ch);
             else if(ch <32) node=tnode::SETCH;
             else node = tnode::WRITE;
             break;