diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-23 18:39:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-24 15:27:28 +0200 |
| commit | 6390d2c52b75b2868d5ee98863a0af4f103c12e5 (patch) | |
| tree | ed9f11baf9f45d2de0270eb1a61983fb4a302df9 /svtools | |
| parent | 3fb56b38c46849569fe2035a3f377a396e2ec8fd (diff) | |
Get rid of comphelper::string::is*Ascii functions
Change-Id: I99912112e5b009d7a143f9816d757cdf6ebb1783
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 8 | ||||
| -rw-r--r-- | svtools/source/svrtf/parrtf.cxx | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 4ea4835aafb8..0158436859c8 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -418,12 +418,12 @@ int HTMLParser::FilterToken( int nToken ) return nToken; } -#define HTML_ISDIGIT( c ) comphelper::string::isdigitAscii(c) -#define HTML_ISALPHA( c ) comphelper::string::isalphaAscii(c) -#define HTML_ISALNUM( c ) comphelper::string::isalnumAscii(c) +#define HTML_ISDIGIT( c ) rtl::isAsciiDigit(c) +#define HTML_ISALPHA( c ) rtl::isAsciiAlpha(c) +#define HTML_ISALNUM( c ) rtl::isAsciiAlphanumeric(c) #define HTML_ISSPACE( c ) ( ' ' == c || (c >= 0x09 && c <= 0x0d) ) #define HTML_ISPRINTABLE( c ) ( c >= 32 && c != 127) -#define HTML_ISHEXDIGIT( c ) comphelper::string::isxdigitAscii(c) +#define HTML_ISHEXDIGIT( c ) rtl::isAsciiHexDigit(c) int HTMLParser::ScanText( const sal_Unicode cBreak ) { diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index fc98b8781e60..00f15e585f63 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -17,20 +17,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> +#include <rtl/character.hxx> +#include <rtl/strbuf.hxx> #include <rtl/tencinfo.h> +#include <rtl/ustrbuf.hxx> #include <tools/stream.hxx> #include <tools/debug.hxx> #include <svtools/rtftoken.h> #include <svtools/rtfkeywd.hxx> #include <svtools/parrtf.hxx> -#include <comphelper/string.hxx> const int MAX_STRING_LEN = 1024; const int MAX_TOKEN_LEN = 128; -#define RTF_ISDIGIT( c ) comphelper::string::isdigitAscii(c) -#define RTF_ISALPHA( c ) comphelper::string::isalphaAscii(c) +#define RTF_ISDIGIT( c ) rtl::isAsciiDigit(c) +#define RTF_ISALPHA( c ) rtl::isAsciiAlpha(c) SvRTFParser::SvRTFParser( SvStream& rIn, sal_uInt8 nStackSize ) : SvParser( rIn, nStackSize ) |