diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-20 12:07:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-20 19:00:36 +0100 |
| commit | 8bb4b18127cdc6259ecd65ec0f28d27d0513cb26 (patch) | |
| tree | 3992f44ffe474da9b38094b93267692c2afb0b01 | |
| parent | b0fd64b2fa7ae1fd8d435c64b7b69758e98e8926 (diff) | |
Related: fdo#38838 remove String::Equals
Change-Id: Ib85907c9e274ba4e4f4c9394f3d4ecf0c9374603
| -rw-r--r-- | include/tools/string.hxx | 9 | ||||
| -rw-r--r-- | tools/source/string/tustring.cxx | 30 |
2 files changed, 5 insertions, 34 deletions
diff --git a/include/tools/string.hxx b/include/tools/string.hxx index 13c3ce0a1184..482d098a8dda 100644 --- a/include/tools/string.hxx +++ b/include/tools/string.hxx @@ -140,8 +140,6 @@ private: TOOLS_DLLPRIVATE UniString& Append( const sal_Unicode* pCharStr ); TOOLS_DLLPRIVATE UniString& Append( const sal_Unicode* pCharStr, xub_StrLen nLen ); TOOLS_DLLPRIVATE UniString& Expand( xub_StrLen nCount, sal_Unicode cExpandChar ); - TOOLS_DLLPRIVATE sal_Bool Equals( const sal_Unicode* pCharStr, - xub_StrLen nIndex, xub_StrLen nLen ) const; TOOLS_DLLPRIVATE UniString& Insert( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen, xub_StrLen nIndex = STRING_LEN ); @@ -220,14 +218,9 @@ public: UniString& Insert( sal_Unicode c, xub_StrLen nIndex = STRING_LEN ); UniString Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ) const; - sal_Bool Equals( const UniString& rStr ) const; - sal_Bool Equals( const UniString& rStr, - xub_StrLen nIndex, xub_StrLen nLen ) const; - const sal_Unicode* GetBuffer() const { return mpData->maStr; } - friend sal_Bool operator == ( const UniString& rStr1, const UniString& rStr2 ) - { return rStr1.Equals( rStr2 ); } + friend sal_Bool operator == ( const UniString& rStr1, const UniString& rStr2 ); friend sal_Bool operator != ( const UniString& rStr1, const UniString& rStr2 ) { return !(operator == ( rStr1, rStr2 )); } friend sal_Bool operator < ( const UniString& rStr1, const UniString& rStr2 ) diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index c4604229e30c..3d174a4b3e56 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -110,37 +110,15 @@ StringCompare STRING::CompareTo( const STRING& rStr, xub_StrLen nLen ) const return COMPARE_GREATER; } -sal_Bool STRING::Equals( const STRING& rStr ) const +sal_Bool operator==(const UniString& rStr1, const UniString& rStr2) { - DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); - - if ( mpData == rStr.mpData ) + if ( rStr1.mpData == rStr2.mpData ) return sal_True; - if ( mpData->mnLen != rStr.mpData->mnLen ) + if ( rStr1.mpData->mnLen != rStr2.mpData->mnLen ) return sal_False; - return (ImplStringCompareWithoutZero( mpData->maStr, rStr.mpData->maStr, mpData->mnLen ) == 0); -} - -sal_Bool STRING::Equals( const STRING& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const -{ - DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); - - // Are there enough codes for comparing? - if ( nIndex > mpData->mnLen ) - return (rStr.mpData->mnLen == 0); - sal_Int32 nMaxLen = mpData->mnLen-nIndex; - if ( nMaxLen < nLen ) - { - if ( rStr.mpData->mnLen != nMaxLen ) - return sal_False; - nLen = static_cast< xub_StrLen >(nMaxLen); - } - - return (ImplStringCompareWithoutZero( mpData->maStr+nIndex, rStr.mpData->maStr, nLen ) == 0); + return (ImplStringCompareWithoutZero( rStr1.mpData->maStr, rStr2.mpData->maStr, rStr1.mpData->mnLen ) == 0); } STRING& STRING::Append( STRCODE c ) |