[Libreoffice-commits] core.git: include/tools tools/source unusedcode.easy

[Caolán McNamara]

 include/tools/string.hxx       |    2 -
 tools/source/string/strimp.cxx |   42 -----------------------------------------
 unusedcode.easy                |    1 
 3 files changed, 1 insertion(+), 44 deletions(-)

New commits:
commit 5167539b10478cdb14d6690147d440d99ea05e83
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Sep 14 14:04:23 2013 +0100

    Related: fdo#38838 one UniString::Search variant now unused
    
    Change-Id: Id0b7b9bf53985f0692cd446a528274fb2009d33e

diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 5fd64e9..543ad6f 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -137,6 +137,7 @@ private:
     TOOLS_DLLPRIVATE sal_Bool   Equals( const sal_Unicode* pCharStr,
                                 xub_StrLen nIndex, xub_StrLen nLen ) const;
     TOOLS_DLLPRIVATE sal_Bool   EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr ) const;
+    TOOLS_DLLPRIVATE xub_StrLen Search( const sal_Unicode* pCharStr, xub_StrLen nIndex = 0 ) const;
 public:
                         UniString();
                         UniString( const ResId& rResId );
@@ -250,7 +251,6 @@ public:
 
     xub_StrLen          Search( sal_Unicode c, xub_StrLen nIndex = 0 ) const;
     xub_StrLen          Search( const UniString& rStr, xub_StrLen nIndex = 0 ) const;
-    xub_StrLen          Search( const sal_Unicode* pCharStr, xub_StrLen nIndex = 0 ) const;
     xub_StrLen          SearchAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex = 0 ) const;
     xub_StrLen          SearchBackward( sal_Unicode c, xub_StrLen nIndex = STRING_LEN ) const;
 
diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx
index c6d882b..3357c22 100644
--- a/tools/source/string/strimp.cxx
+++ b/tools/source/string/strimp.cxx
@@ -428,48 +428,6 @@ xub_StrLen STRING::Search( const STRING& rStr, xub_StrLen nIndex ) const
     return STRING_NOTFOUND;
 }
 
-xub_StrLen STRING::Search( const STRCODE* pCharStr, xub_StrLen nIndex ) const
-{
-    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-    sal_Int32 nLen = mpData->mnLen;
-    xub_StrLen nStrLen  = ImplStringLen( pCharStr );
-
-    // rStr was not found if its length is zero
-    // or index is larger than searched string
-    if ( !nStrLen || (nIndex >= nLen) )
-        return STRING_NOTFOUND;
-
-    const STRCODE* pStr = mpData->maStr;
-    pStr += nIndex;
-
-    if ( nStrLen == 1 )
-    {
-        STRCODE cSearch = *pCharStr;
-        while ( nIndex < nLen )
-        {
-            if ( *pStr == cSearch )
-                return nIndex;
-            ++pStr,
-            ++nIndex;
-        }
-    }
-    else
-    {
-        // search only within string
-        while ( nLen - nIndex >= nStrLen )
-        {
-            // increase match if found
-            if ( ImplStringCompareWithoutZero( pStr, pCharStr, nStrLen ) == 0 )
-                return nIndex;
-            ++pStr,
-            ++nIndex;
-        }
-    }
-
-    return STRING_NOTFOUND;
-}
-
 void STRING::SearchAndReplaceAll( STRCODE c, STRCODE cRep )
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/unusedcode.easy b/unusedcode.easy
index 8004805..f736e9d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -57,7 +57,6 @@ SfxGrabBagItem::SetGrabBag(std::__debug::map<rtl::OUString, com::sun::star::uno:
 SfxTemplatePanelControl::SetParagraphFamily()
 SmFontPickList::Contains(Font const&) const
 SmParser::Insert(rtl::OUString const&, int)
-String::Search(unsigned short const*, unsigned short) const
 SvdProgressInfo::ReportError()
 SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short)
 SvpSalInstance::PostedEventsInQueue()