From fdf85819c33abe5a81d19a94b3bac0800b6cda30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 18 Oct 2013 16:04:40 +0100 Subject: [PATCH] Related: fdo#38838 remove String::Match Change-Id: I9db663dbcb432cbfe380e1272d6daaed3e6f4221 --- include/tools/string.hxx | 2 -- tools/source/string/tustring.cxx | 26 -------------------------- 2 files changed, 28 deletions(-) diff --git a/include/tools/string.hxx b/include/tools/string.hxx index 16f28dbe4eaf..2e9e1cbc09d5 100644 --- a/include/tools/string.hxx +++ b/include/tools/string.hxx @@ -229,8 +229,6 @@ public: sal_Bool Equals( const UniString& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - xub_StrLen Match( const UniString& rStr ) const; - xub_StrLen Search( sal_Unicode c, xub_StrLen nIndex = 0 ) const; xub_StrLen Search( const UniString& rStr, xub_StrLen nIndex = 0 ) const; diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index 40c99cf8363f..59b80d7016cb 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -186,32 +186,6 @@ sal_Bool STRING::Equals( const STRING& rStr, xub_StrLen nIndex, xub_StrLen nLen return (ImplStringCompareWithoutZero( mpData->maStr+nIndex, rStr.mpData->maStr, nLen ) == 0); } -xub_StrLen STRING::Match( const STRING& rStr ) const -{ - DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); - - // return if string is empty - if ( !mpData->mnLen ) - return STRING_MATCH; - - // Search the string for unmatching chars - const STRCODE* pStr1 = mpData->maStr; - const STRCODE* pStr2 = rStr.mpData->maStr; - xub_StrLen i = 0; - while ( i < mpData->mnLen ) - { - // Abort on the first unmatching char - if ( *pStr1 != *pStr2 ) - return i; - ++pStr1, - ++pStr2, - ++i; - } - - return STRING_MATCH; -} - STRING& STRING::Append( STRCODE c ) { DBG_CHKTHIS( STRING, DBGCHECKSTRING );