diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-13 12:28:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-15 09:11:34 +0200 |
| commit | a2669bccb89b3882bca4535a23f1c9ac31a485ad (patch) | |
| tree | 54d3092bae120eb179797ad14c52d3f90a8a1ff4 /svtools | |
| parent | f42a7e40489c612c43c77e5de3eea60344ea30cc (diff) | |
convert include/svtools/rtftoken.h from String to OUString
Change-Id: I31fffd6aeedefb31600bda959bc3901292829ba3
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/svrtf/rtfkeywd.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx index ca664fa94389..db0286cc57ad 100644 --- a/svtools/source/svrtf/rtfkeywd.cxx +++ b/svtools/source/svrtf/rtfkeywd.cxx @@ -31,7 +31,7 @@ struct RTF_TokenEntry { union{ const sal_Char* sToken; - const String* pUToken; + const OUString* pUToken; }; int nToken; }; @@ -1182,16 +1182,18 @@ static int SAL_CALL RTFKeyCompare( const void *pFirst, const void *pSecond) if( -1 == ((RTF_TokenEntry*)pFirst)->nToken ) { if( -1 == ((RTF_TokenEntry*)pSecond)->nToken ) - nRet = ((RTF_TokenEntry*)pFirst)->pUToken->CompareTo( + nRet = ((RTF_TokenEntry*)pFirst)->pUToken->compareTo( *((RTF_TokenEntry*)pSecond)->pUToken ); else - nRet = ((RTF_TokenEntry*)pFirst)->pUToken->CompareIgnoreCaseToAscii( + { + nRet = ((RTF_TokenEntry*)pFirst)->pUToken->compareToIgnoreAsciiCaseAscii( ((RTF_TokenEntry*)pSecond)->sToken ); + } } else { if( -1 == ((RTF_TokenEntry*)pSecond)->nToken ) - nRet = -1 * ((RTF_TokenEntry*)pSecond)->pUToken->CompareIgnoreCaseToAscii( + nRet = -1 * ((RTF_TokenEntry*)pSecond)->pUToken->compareToIgnoreAsciiCaseAscii( ((RTF_TokenEntry*)pFirst)->sToken ); else nRet = strcmp( ((RTF_TokenEntry*)pFirst)->sToken, @@ -1203,7 +1205,7 @@ static int SAL_CALL RTFKeyCompare( const void *pFirst, const void *pSecond) } -int GetRTFToken( const String& rSearch ) +int GetRTFToken( const OUString& rSearch ) { if( !bSortKeyWords ) { |