diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-22 16:58:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-22 20:32:02 +0100 |
| commit | 81202ae7487b139cb473ff85634003b36d67e8c4 (patch) | |
| tree | 5f204d5078b696b2f99aa360d3042a24b34a213b /tools | |
| parent | da2c3cf0aa78cb3363b3ded2bebc418d0cc7ffca (diff) | |
Related: fdo#38838 remove UniString::CompareIgnoreCaseToAscii
Change-Id: I4a9b34d63d2534a35aa9a878b8c2bec15262c2be
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/string/strascii.cxx | 18 | ||||
| -rw-r--r-- | tools/source/string/tustring.cxx | 25 |
2 files changed, 0 insertions, 43 deletions
diff --git a/tools/source/string/strascii.cxx b/tools/source/string/strascii.cxx index 83094ffac273..5fcea9fa7907 100644 --- a/tools/source/string/strascii.cxx +++ b/tools/source/string/strascii.cxx @@ -313,24 +313,6 @@ StringCompare UniString::CompareToAscii( const sal_Char* pAsciiStr, return COMPARE_GREATER; } -StringCompare UniString::CompareIgnoreCaseToAscii( const sal_Char* pAsciiStr, - xub_StrLen nLen ) const -{ - DBG_CHKTHIS( UniString, DbgCheckUniString ); - DBG_ASSERT( ImplDbgCheckAsciiStr( pAsciiStr, nLen ), - "UniString::CompareIgnoreCaseToAscii() - pAsciiStr include characters > 127" ); - - // compare strings - sal_Int32 nCompare = ImplStringICompareAscii( mpData->maStr, pAsciiStr, nLen ); - - if ( nCompare == 0 ) - return COMPARE_EQUAL; - else if ( nCompare < 0 ) - return COMPARE_LESS; - else - return COMPARE_GREATER; -} - sal_Bool UniString::EqualsAscii( const sal_Char* pAsciiStr ) const { DBG_CHKTHIS( UniString, DbgCheckUniString ); diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index 2bc82800b0cb..4d081bd72d0e 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -172,31 +172,6 @@ sal_Bool STRING::EqualsIgnoreCaseAscii( const STRING& rStr, xub_StrLen nIndex, x return (ImplStringICompareWithoutZero( mpData->maStr+nIndex, rStr.mpData->maStr, nLen ) == 0); } -StringCompare STRING::CompareIgnoreCaseToAscii( const STRING& rStr, - xub_StrLen nLen ) const -{ - DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); - - if ( mpData == rStr.mpData ) - return COMPARE_EQUAL; - - // determine maximal length - if ( mpData->mnLen < nLen ) - nLen = static_cast< xub_StrLen >(mpData->mnLen+1); - if ( rStr.mpData->mnLen < nLen ) - nLen = static_cast< xub_StrLen >(rStr.mpData->mnLen+1); - - sal_Int32 nCompare = ImplStringICompareWithoutZero( mpData->maStr, rStr.mpData->maStr, nLen ); - - if ( nCompare == 0 ) - return COMPARE_EQUAL; - else if ( nCompare < 0 ) - return COMPARE_LESS; - else - return COMPARE_GREATER; -} - STRING& STRING::Insert( STRCODE c, xub_StrLen nIndex ) { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); |