From c8e39e66528affb66f1ae121fa36dd4ab31a9b0b Mon Sep 17 00:00:00 2001 From: Arnaud Versini Date: Sat, 10 Aug 2013 12:41:03 +0200 Subject: Introduce rtl::compareIgnoreCase and deprecate rtl/character.hxx equivalents. Change-Id: Id90935fd2b0f904f89477792edc8140cfc31e91f Reviewed-on: https://gerrit.libreoffice.org/5412 Reviewed-by: Petr Mladek Tested-by: Petr Mladek --- unotools/source/i18n/charclass.cxx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'unotools') diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx index 2b620262030c..ba86a2b531fc 100644 --- a/unotools/source/i18n/charclass.cxx +++ b/unotools/source/i18n/charclass.cxx @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -85,7 +86,7 @@ bool CharClass::isAsciiNumeric( const OUString& rStr ) do { - if ( !isAsciiDigit( *p ) ) + if ( !rtl::isAsciiDigit( *p ) ) return false; } while ( ++p < pStop ); @@ -104,7 +105,7 @@ bool CharClass::isAsciiAlpha( const OUString& rStr ) do { - if ( !isAsciiAlpha( *p ) ) + if ( !rtl::isAsciiAlpha( *p ) ) return false; } while ( ++p < pStop ); @@ -118,7 +119,7 @@ bool CharClass::isAlpha( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[nPos]; if ( c < 128 ) - return isAsciiAlpha( c ); + return rtl::isAsciiAlpha( c ); try { @@ -141,7 +142,7 @@ bool CharClass::isLetter( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[nPos]; if ( c < 128 ) - return isAsciiAlpha( c ); + return rtl::isAsciiAlpha( c ); try { @@ -180,7 +181,7 @@ bool CharClass::isDigit( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[ nPos ]; if ( c < 128 ) - return isAsciiDigit( c ); + return rtl::isAsciiDigit( c ); try { @@ -219,7 +220,7 @@ bool CharClass::isAlphaNumeric( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[nPos]; if ( c < 128 ) - return isAsciiAlphaNumeric( c ); + return rtl::isAsciiAlphanumeric( c ); try { @@ -241,7 +242,7 @@ bool CharClass::isLetterNumeric( const OUString& rStr, sal_Int32 nPos ) const { sal_Unicode c = rStr[nPos]; if ( c < 128 ) - return isAsciiAlphaNumeric( c ); + return rtl::isAsciiAlphanumeric( c ); try { -- cgit