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

[Arnaud Versini]

 xmlhelp/source/cxxhelp/provider/urlparameter.cxx |   23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

New commits:
commit a46803587d48adccfb314dc0e7e9d07daed1b313
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date:   Sun Sep 18 16:55:38 2016 +0200

    Replace local ASCII function with rtl/character.hxx
    
    Change-Id: I63568dabbcea4159276b4020af6bc01f9175dfa7
    Reviewed-on: https://gerrit.libreoffice.org/28996
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 4db1933..0099970 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -27,6 +27,7 @@
 #include <comphelper/processfactory.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <rtl/character.hxx>
 #include <libxslt/xslt.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
@@ -46,26 +47,6 @@
 #include "urlparameter.hxx"
 #include "databases.hxx"
 
-namespace chelp {
-
-    inline bool ascii_isDigit( sal_Unicode ch )
-    {
-        return ((ch >= 0x0030) && (ch <= 0x0039));
-    }
-
-    inline bool ascii_isLetter( sal_Unicode ch )
-    {
-        return ( ( (ch >= 0x0041) && (ch <= 0x005A) ) ||
-                 ( (ch >= 0x0061) && (ch <= 0x007A) ) );
-    }
-
-    inline bool isLetterOrDigit( sal_Unicode ch )
-    {
-        return ascii_isLetter( ch ) || ascii_isDigit( ch );
-    }
-
-}
-
 using namespace cppu;
 using namespace com::sun::star::io;
 using namespace com::sun::star::uno;
@@ -469,7 +450,7 @@ bool URLParameter::module()
 {
     sal_Int32 idx = 0,length = m_aExpr.getLength();
 
-    while( idx < length && isLetterOrDigit( (m_aExpr.getStr())[idx] ) )
+    while( idx < length && rtl::isAsciiAlphanumeric( (m_aExpr.getStr())[idx] ) )
         ++idx;
 
     if( idx != 0 )