summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorArnaud Versini <arnaud.versini@gmail.com>2016-09-18 16:55:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-09-19 07:06:15 +0000
commita46803587d48adccfb314dc0e7e9d07daed1b313 (patch)
tree9f1dd7fcc243a5d4cef4e01bcecb7c9337dfb4eb /xmlhelp
parent7d794b193ef517de979bc1e481f655eb1124103c (diff)
Replace local ASCII function with rtl/character.hxx
Change-Id: I63568dabbcea4159276b4020af6bc01f9175dfa7 Reviewed-on: https://gerrit.libreoffice.org/28996 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx23
1 files changed, 2 insertions, 21 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 4db1933dc82d..0099970f7c6e 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 )