mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Related: fdo#38838 one UniString::Search variant now unused

Browse Source 
Change-Id: Id0b7b9bf53985f0692cd446a528274fb2009d33e
This commit is contained in:
Caolán McNamara
2013-09-14 14:04:23 +01:00
parent 767a65d9dd
commit 5167539b10
3 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/tools/string.hxx
View File

@@ -137,6 +137,7 @@ private:
TOOLS_DLLPRIVATE sal_Bool Equals( const sal_Unicode* pCharStr, TOOLS_DLLPRIVATE sal_Bool Equals( const sal_Unicode* pCharStr,
xub_StrLen nIndex, xub_StrLen nLen ) const; xub_StrLen nIndex, xub_StrLen nLen ) const;
TOOLS_DLLPRIVATE sal_Bool EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr ) 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: public:
UniString(); UniString();
UniString( const ResId& rResId ); UniString( const ResId& rResId );
@@ -250,7 +251,6 @@ public:
xub_StrLen Search( sal_Unicode c, xub_StrLen nIndex = 0 ) const; 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 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 SearchAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex = 0 ) const;
xub_StrLen SearchBackward( sal_Unicode c, xub_StrLen nIndex = STRING_LEN ) const; xub_StrLen SearchBackward( sal_Unicode c, xub_StrLen nIndex = STRING_LEN ) const;

42
tools/source/string/strimp.cxx
View File

@@ -428,48 +428,6 @@ xub_StrLen STRING::Search( const STRING& rStr, xub_StrLen nIndex ) const
return STRING_NOTFOUND; 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 ) void STRING::SearchAndReplaceAll( STRCODE c, STRCODE cRep )
{ {
DBG_CHKTHIS( STRING, DBGCHECKSTRING ); DBG_CHKTHIS( STRING, DBGCHECKSTRING );

1
unusedcode.easy
View File

@@ -57,7 +57,6 @@ SfxGrabBagItem::SetGrabBag(std::__debug::map<rtl::OUString, com::sun::star::uno:
SfxTemplatePanelControl::SetParagraphFamily() SfxTemplatePanelControl::SetParagraphFamily()
SmFontPickList::Contains(Font const&) const SmFontPickList::Contains(Font const&) const
SmParser::Insert(rtl::OUString const&, int) SmParser::Insert(rtl::OUString const&, int)
String::Search(unsigned short const*, unsigned short) const
SvdProgressInfo::ReportError() SvdProgressInfo::ReportError()
SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short) SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short)
SvpSalInstance::PostedEventsInQueue() SvpSalInstance::PostedEventsInQueue()