diff options
| author | Arnaud Versini <arnaud.versini@libreoffice.org> | 2013-09-07 17:11:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-30 11:49:22 +0200 |
| commit | 89de6ba4c65c8709e32fe636ff743d914cf56225 (patch) | |
| tree | e74c324223f4a8e9550fe778893a7e98a82490c7 /tools/source/fsys/urlobj.cxx | |
| parent | c1df0ce01b441ffa3e6238d93e49532620a1fc93 (diff) | |
Introduce ASCII case conversion and use more/rtl/character.hxx.
Also remove all others implementations.
Change-Id: I1dc108a9103f087bd8ce591dff2ac5dd254746f8
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'tools/source/fsys/urlobj.cxx')
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index fee81b76ff15..c1bb3cc60127 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -30,6 +30,8 @@ #include "rtl/ustring.hxx" #include "sal/types.h" +#include <rtl/character.hxx> + #include <algorithm> #include <limits> @@ -562,7 +564,7 @@ static sal_uInt32 const aMustEncodeMap[128] inline bool mustEncode(sal_uInt32 nUTF32, INetURLObject::Part ePart) { - return !INetMIME::isUSASCII(nUTF32) || !(aMustEncodeMap[nUTF32] & ePart); + return !rtl::isAscii(nUTF32) || !(aMustEncodeMap[nUTF32] & ePart); } } @@ -2209,7 +2211,7 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *& } if (p >= pEnd) break; - sal_uInt32 nChar = INetMIME::toLowerCase(*p++); + sal_uInt32 nChar = rtl::toAsciiLowerCase(*p++); while (pFirst <= pLast && sal_uChar(pFirst->m_pPrefix[i]) < nChar) ++pFirst; while (pFirst <= pLast && sal_uChar(pLast->m_pPrefix[i]) > nChar) @@ -2219,7 +2221,7 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *& { sal_Char const * q = pFirst->m_pPrefix + i; while (p < pEnd && *q != '\0' - && INetMIME::toLowerCase(*p) == sal_uChar(*q)) + && rtl::toAsciiLowerCase(*p) == sal_uChar(*q)) { ++p; ++q; @@ -3229,7 +3231,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme, eCharset, eEscapeType); appendUCS4(aTheSynPath, eEscapeType == ESCAPE_NO ? - INetMIME::toLowerCase(nUTF32) : nUTF32, + rtl::toAsciiLowerCase(nUTF32) : nUTF32, eEscapeType, bOctets, PART_VIM, '=', eCharset, false); } @@ -3685,7 +3687,7 @@ OUString INetURLObject::decode(sal_Unicode const * pBegin, case ESCAPE_UTF32: if ( - INetMIME::isUSASCII(nUTF32) && + rtl::isAscii(nUTF32) && ( eMechanism == DECODE_TO_IURI || ( @@ -5062,7 +5064,7 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin, OSL_FAIL( "INetURLObject::getUTF32(): Unsupported charset"); case RTL_TEXTENCODING_ASCII_US: - rEscapeType = INetMIME::isUSASCII(nUTF32) ? + rEscapeType = rtl::isAscii(nUTF32) ? ESCAPE_UTF32 : ESCAPE_OCTET; break; @@ -5071,7 +5073,7 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin, break; case RTL_TEXTENCODING_UTF8: - if (INetMIME::isUSASCII(nUTF32)) + if (rtl::isAscii(nUTF32)) rEscapeType = ESCAPE_UTF32; else { |