summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-16 08:36:57 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-08-16 13:59:30 +0100
commitd69d6f4dc8eef7cd85929a2655c523d2f17263e0 (patch)
tree1a598169dbfa6152061f3fa0b5383f9a1392a096
parentecbb33dd8044ad45cf05f868f829e635e03d7589 (diff)
Related: fdo#38838 ToInt64 and a EqualsIgnoreCaseAscii variant are now unused
Change-Id: I2a2cc56cf005f564c798b8d43ef7e8c4b7f9eeff
-rw-r--r--framework/inc/uielement/macrosmenucontroller.hxx2
-rw-r--r--framework/inc/uielement/menubarmanager.hxx2
-rw-r--r--framework/source/uielement/macrosmenucontroller.cxx4
-rw-r--r--framework/source/uielement/menubarmanager.cxx4
-rw-r--r--include/sfx2/styfitem.hxx1
-rw-r--r--include/svx/txenctab.hxx1
-rw-r--r--include/tools/config.hxx2
-rw-r--r--include/tools/inetmime.hxx1
-rw-r--r--include/tools/rc.hxx1
-rw-r--r--include/tools/resary.hxx1
-rw-r--r--include/tools/resmgr.hxx1
-rw-r--r--include/tools/simplerm.hxx1
-rw-r--r--include/tools/string.hxx5
-rw-r--r--reportdesign/source/ui/inc/metadata.hxx1
-rw-r--r--scaddins/source/analysis/analysis.cxx4
-rw-r--r--scaddins/source/analysis/analysishelper.hxx4
-rw-r--r--scaddins/source/datefunc/datefunc.cxx2
-rw-r--r--scaddins/source/datefunc/datefunc.hxx4
-rw-r--r--scaddins/source/pricing/pricing.cxx2
-rw-r--r--scaddins/source/pricing/pricing.hxx4
-rw-r--r--sccomp/source/solver/solver.cxx2
-rw-r--r--svtools/source/contnr/imivctl1.cxx4
-rw-r--r--svtools/source/contnr/treelistbox.cxx2
-rw-r--r--svtools/source/control/ctrltool.cxx31
-rw-r--r--svtools/source/control/valueimp.hxx2
-rw-r--r--svx/source/inc/stringlistresource.hxx2
-rw-r--r--tools/inc/impstrg.hxx1
-rw-r--r--tools/source/ref/errinf.cxx1
-rw-r--r--tools/source/string/tustring.cxx40
29 files changed, 41 insertions, 91 deletions
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index c712115a88fd..e516f80caca2 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -72,7 +72,7 @@ namespace framework
private:
virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
- String RetrieveLabelFromCommand( const String& aCmdURL );
+ OUString RetrieveLabelFromCommand(const OUString& rCmdURL);
void addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId );
};
}
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 50e27d663bf1..50a112b32396 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -171,7 +171,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
void RequestImages();
void RetrieveImageManagers();
static sal_Bool MustBeHidden( PopupMenu* pPopupMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer );
- String RetrieveLabelFromCommand( const String& aCmdURL );
+ OUString RetrieveLabelFromCommand(const OUString& rCmdURL);
private:
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index f9dd1f3bf722..f7feca02d4bc 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -157,10 +157,10 @@ IMPL_STATIC_LINK_NOINSTANCE( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo*
return 0;
}
-String MacrosMenuController::RetrieveLabelFromCommand( const String& aCmdURL )
+OUString MacrosMenuController::RetrieveLabelFromCommand(const OUString& rCmdURL)
{
sal_Bool bModuleIdentified = !m_aModuleIdentifier.isEmpty();
- return framework::RetrieveLabelFromCommand(aCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,bModuleIdentified,"Label");
+ return framework::RetrieveLabelFromCommand(rCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,bModuleIdentified,"Label");
}
void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId )
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 34f1b3eb75f3..ad667efa7e01 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1149,9 +1149,9 @@ sal_Bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< X
return sal_True;
}
-String MenuBarManager::RetrieveLabelFromCommand( const String& aCmdURL )
+OUString MenuBarManager::RetrieveLabelFromCommand(const OUString& rCmdURL)
{
- return framework::RetrieveLabelFromCommand(aCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,m_bModuleIdentified,"Label");
+ return framework::RetrieveLabelFromCommand(rCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,m_bModuleIdentified,"Label");
}
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index b4c88340b935..4ab8ccb209fa 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -25,6 +25,7 @@
#include <vcl/bitmap.hxx>
#include <vcl/image.hxx>
#include <tools/rc.hxx>
+#include <tools/string.hxx>
#include <rsc/rscsfx.hxx>
#include <vector>
diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx
index 0b8d14e89b74..acb6ffbbe5f6 100644
--- a/include/svx/txenctab.hxx
+++ b/include/svx/txenctab.hxx
@@ -20,6 +20,7 @@
#define _SVX_TXENCTAB_HXX
#include <tools/resary.hxx>
+#include <tools/string.hxx>
#include <rtl/textenc.h>
#include "svx/svxdllapi.h"
diff --git a/include/tools/config.hxx b/include/tools/config.hxx
index d19cc0dbbb55..f3f29b293ee0 100644
--- a/include/tools/config.hxx
+++ b/include/tools/config.hxx
@@ -20,7 +20,7 @@
#define _CONFIG_HXX
#include "tools/toolsdllapi.h"
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
struct ImplConfigData;
struct ImplGroupData;
diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx
index 347bb78861fd..256f350cb87d 100644
--- a/include/tools/inetmime.hxx
+++ b/include/tools/inetmime.hxx
@@ -30,7 +30,6 @@
#include <rtl/tencinfo.h>
#include <tools/debug.hxx>
#include <tools/errcode.hxx>
-#include <tools/string.hxx>
class DateTime;
class INetContentTypeParameterList;
diff --git a/include/tools/rc.hxx b/include/tools/rc.hxx
index e89b91104849..8243e55f3758 100644
--- a/include/tools/rc.hxx
+++ b/include/tools/rc.hxx
@@ -21,7 +21,6 @@
#include "tools/toolsdllapi.h"
#include <i18nlangtag/lang.h>
-#include <tools/string.hxx>
#include <tools/resmgr.hxx>
class TOOLS_DLLPUBLIC Resource
diff --git a/include/tools/resary.hxx b/include/tools/resary.hxx
index 7337c3487378..1d57694282d3 100644
--- a/include/tools/resary.hxx
+++ b/include/tools/resary.hxx
@@ -22,7 +22,6 @@
#include "boost/noncopyable.hpp"
#include <vector>
#include "tools/toolsdllapi.h"
-#include <tools/string.hxx>
#include <tools/resid.hxx>
#define RESARRAY_INDEX_NOTFOUND (0xffffffff)
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index 9f6b2d246534..419336bbb401 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -21,7 +21,6 @@
#include "tools/toolsdllapi.h"
#include <i18nlangtag/languagetag.hxx>
-#include <tools/string.hxx>
#include <tools/resid.hxx>
#include <vector>
diff --git a/include/tools/simplerm.hxx b/include/tools/simplerm.hxx
index 667454c6150c..37b97782b66c 100644
--- a/include/tools/simplerm.hxx
+++ b/include/tools/simplerm.hxx
@@ -26,7 +26,6 @@
#include <osl/mutex.hxx>
#include <tools/resid.hxx>
#include <i18nlangtag/languagetag.hxx>
-#include <tools/string.hxx>
#include "tools/toolsdllapi.h"
class InternalResMgr;
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 9de7baa15ef6..b70d98879cc9 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -134,8 +134,9 @@ private:
TOOLS_DLLPRIVATE UniString( sal_Unicode c );
TOOLS_DLLPRIVATE UniString& Assign( 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,
+ 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;
public:
UniString();
UniString( const ResId& rResId );
@@ -171,7 +172,6 @@ public:
static const UniString& EmptyString();
sal_Int32 ToInt32() const;
- sal_Int64 ToInt64() const;
UniString& Assign( const UniString& rStr );
UniString& Assign( const OUString& rStr );
@@ -240,7 +240,6 @@ public:
sal_Bool Equals( const UniString& rStr ) const;
sal_Bool EqualsAscii( const sal_Char* pAsciiStr ) const;
sal_Bool EqualsIgnoreCaseAscii( const UniString& rStr ) const;
- sal_Bool EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr ) const;
sal_Bool EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const;
sal_Bool Equals( const UniString& rStr,
xub_StrLen nIndex, xub_StrLen nLen ) const;
diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx
index 543efb1bf0b0..876d3e8b8d6b 100644
--- a/reportdesign/source/ui/inc/metadata.hxx
+++ b/reportdesign/source/ui/inc/metadata.hxx
@@ -23,6 +23,7 @@
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/inspection/XPropertyHandler.hpp>
+#include <tools/string.hxx>
//............................................................................
namespace rptui
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 2362dba807a2..d282df0f5b3a 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -86,7 +86,7 @@ ResMgr& AnalysisAddIn::GetResMgr( void ) throw( uno::RuntimeException )
OUString AnalysisAddIn::GetDisplFuncStr( sal_uInt16 nFuncNum ) throw( uno::RuntimeException )
{
- return String( AnalysisRscStrLoader( RID_ANALYSIS_FUNCTION_NAMES, nFuncNum, GetResMgr() ).GetString() );
+ return AnalysisRscStrLoader( RID_ANALYSIS_FUNCTION_NAMES, nFuncNum, GetResMgr() ).GetString();
}
@@ -108,7 +108,7 @@ public:
AnalysisFuncRes::AnalysisFuncRes( ResId& rRes, ResMgr& rResMgr, sal_uInt16 nInd, OUString& rRet ) : Resource( rRes )
{
- rRet = String( AnalysisResId( nInd, rResMgr ) );
+ rRet = AnalysisResId(nInd, rResMgr).toString();
FreeResource();
}
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 7a3da3335cf4..66a25a525e79 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -298,7 +298,7 @@ class AnalysisResId : public ResId
class AnalysisRscStrLoader : public Resource
{
private:
- String aStr;
+ OUString aStr;
public:
AnalysisRscStrLoader( sal_uInt16 nRsc, sal_uInt16 nStrId, ResMgr& rResMgr ) :
Resource( AnalysisResId( nRsc, rResMgr ) ),
@@ -307,7 +307,7 @@ public:
FreeResource();
}
- const String& GetString() const { return aStr; }
+ const OUString& GetString() const { return aStr; }
};
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 07dcd841b67e..2615697b05c5 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -185,7 +185,7 @@ const ScaFuncData* ScaFuncDataList::Get( const OUString& rProgrammaticName ) con
ScaFuncRes::ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet ) :
Resource( rResId )
{
- rRet = String( ScaResId( nIndex, rResMgr ) );
+ rRet = ScaResId(nIndex, rResMgr).toString();
FreeResource();
}
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index 03373e2c7fe2..9569138482af 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -144,12 +144,12 @@ public:
class ScaResStringLoader : public Resource
{
private:
- String aStr;
+ OUString aStr;
public:
inline ScaResStringLoader( sal_uInt16 nResId, sal_uInt16 nStrId, ResMgr& rResMgr );
- inline const String& GetString() const { return aStr; }
+ inline const OUString& GetString() const { return aStr; }
};
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index d4da90135819..92048e623512 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -188,7 +188,7 @@ const ScaFuncData* ScaFuncDataList::Get( const OUString& rProgrammaticName ) con
ScaFuncRes::ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet ) :
Resource( rResId )
{
- rRet = String( ScaResId( nIndex, rResMgr ) );
+ rRet = ScaResId(nIndex, rResMgr).toString();
FreeResource();
}
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index 29d0ff9f3270..dd76f647345a 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -156,12 +156,12 @@ public:
class ScaResStringLoader : public Resource
{
private:
- String aStr;
+ OUString aStr;
public:
inline ScaResStringLoader( sal_uInt16 nResId, sal_uInt16 nStrId, ResMgr& rResMgr );
- inline const String& GetString() const { return aStr; }
+ inline const OUString& GetString() const { return aStr; }
};
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index 1a38e8b7a1df..a9dac3c4a63b 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -92,7 +92,7 @@ static OUString lcl_GetResourceString( sal_uInt32 nId )
if (!pSolverResMgr)
pSolverResMgr = ResMgr::CreateResMgr("solver");
- return String( ResId( nId, *pSolverResMgr ) );
+ return ResId(nId, *pSolverResMgr).toString();
}
// -----------------------------------------------------------------------
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index f1e5084e06c9..201b03178bad 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -80,7 +80,7 @@ public:
SvtIconChoiceCtrl* pParent,
const Point& rPos,
const Size& rSize,
- const XubString& rData,
+ const OUString& rData,
const Link& rNotifyEditEnd );
~IcnViewEdit_Impl();
@@ -3319,7 +3319,7 @@ void SvxIconChoiceCtrl_Impl::SelectAll( sal_Bool bSelect, sal_Bool bPaint )
}
IcnViewEdit_Impl::IcnViewEdit_Impl( SvtIconChoiceCtrl* pParent, const Point& rPos,
- const Size& rSize, const XubString& rData, const Link& rNotifyEditEnd ) :
+ const Size& rSize, const OUString& rData, const Link& rNotifyEditEnd ) :
MultiLineEdit( pParent, (pParent->GetStyle() & WB_ICON) ? WB_CENTER : WB_LEFT),
aCallBackHdl( rNotifyEditEnd ),
bCanceled( sal_False ),
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 45e8317f6ba7..39fb9fb5b5fd 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2056,7 +2056,7 @@ void SvTreeListBox::CheckButtonHdl()
SvTreeListEntry* SvTreeListBox::CloneEntry( SvTreeListEntry* pSource )
{
DBG_CHKTHIS(SvTreeListBox,0);
- XubString aStr;
+ OUString aStr;
Image aCollEntryBmp;
Image aExpEntryBmp;
SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox;
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 877e39012b12..818ed913b602 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -146,21 +146,21 @@ static sal_Int32 ImplCompareFontInfo( ImplFontListFontInfo* pInfo1,
// =======================================================================
-static void ImplMakeSearchString( XubString& rStr )
+static OUString ImplMakeSearchString(const OUString& rStr)
{
- rStr.ToLowerAscii();
+ return rStr.toAsciiLowerCase();
}
// -----------------------------------------------------------------------
-static void ImplMakeSearchStringFromName( XubString& rStr )
+static OUString ImplMakeSearchStringFromName(const OUString& rStr)
{
// check for features before alternate font separator
- if (rStr.Search(':') < rStr.Search(';'))
- rStr = rStr.GetToken( 0, ':' );
- else
- rStr = rStr.GetToken( 0, ';' );
- ImplMakeSearchString( rStr );
+ sal_Int32 nColon = rStr.indexOf(':');
+ sal_Int32 nSemiColon = rStr.indexOf(';');
+ if (nColon != -1 && (nSemiColon == -1 || nColon < nSemiColon))
+ return ImplMakeSearchString(rStr.getToken( 0, ':' ));
+ return ImplMakeSearchString(rStr.getToken( 0, ';' ));
}
// -----------------------------------------------------------------------
@@ -236,17 +236,12 @@ ImplFontListNameInfo* FontList::ImplFind(const OUString& rSearchName, sal_uLong*
return const_cast<ImplFontListNameInfo*>(pFoundData);
}
-// -----------------------------------------------------------------------
-
ImplFontListNameInfo* FontList::ImplFindByName(const OUString& rStr) const
{
- XubString aSearchName = rStr;
- ImplMakeSearchStringFromName( aSearchName );
+ OUString aSearchName = ImplMakeSearchStringFromName(rStr);
return ImplFind( aSearchName, NULL );
}
-// -----------------------------------------------------------------------
-
void FontList::ImplInsertFonts( OutputDevice* pDevice, sal_Bool bAll,
sal_Bool bInsertData )
{
@@ -270,10 +265,10 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, sal_Bool bAll,
if ( !bAll && (aFontInfo.GetType() == TYPE_RASTER) )
continue;
- XubString aSearchName = aFontInfo.GetName();
+ OUString aSearchName(aFontInfo.GetName());
ImplFontListNameInfo* pData;
sal_uLong nIndex;
- ImplMakeSearchString( aSearchName );
+ aSearchName = ImplMakeSearchString(aSearchName);
pData = ImplFind( aSearchName, &nIndex );
if ( !pData )
@@ -521,8 +516,8 @@ OUString FontList::GetFontMapText( const FontInfo& rInfo ) const
// search for synthetic style
sal_uInt16 nType = pData->mnType;
- const XubString& rStyleName = rInfo.GetStyleName();
- if ( rStyleName.Len() )
+ const OUString& rStyleName = rInfo.GetStyleName();
+ if (!rStyleName.isEmpty())
{
sal_Bool bNotSynthetic = sal_False;
sal_Bool bNoneAvailable = sal_False;
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index 9095903576f5..09cc83a100e9 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -54,7 +54,7 @@ struct ValueSetItem
bool mbVisible;
Image maImage;
Color maColor;
- XubString maText;
+ OUString maText;
void* mpData;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >* mpxAcc;
diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx
index 35b2e56c2ea5..c38ae72b9bf1 100644
--- a/svx/source/inc/stringlistresource.hxx
+++ b/svx/source/inc/stringlistresource.hxx
@@ -21,7 +21,7 @@
#define SVX_STRINGLISTRESOURCE_HXX
#include <tools/rc.hxx>
-
+#include <tools/string.hxx>
#include <svx/svxdllapi.h>
#include <memory>
diff --git a/tools/inc/impstrg.hxx b/tools/inc/impstrg.hxx
index 1db5ea730048..b7fc086434dc 100644
--- a/tools/inc/impstrg.hxx
+++ b/tools/inc/impstrg.hxx
@@ -20,7 +20,6 @@
#define _IMPSTRG_HXX
#include <tools/tools.h>
-#include <tools/string.hxx>
// Debug methode for Strings
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index 057cc8aa1b69..be016b38ba79 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -21,7 +21,6 @@
#include <tools/shl.hxx>
#include <tools/debug.hxx>
#include <tools/errinf.hxx>
-#include <tools/string.hxx>
#include <rtl/strbuf.hxx>
class ErrorHandler;
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 4d3d8c79f41a..6487eb7628c7 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -66,13 +66,6 @@ sal_Int32 UniString::ToInt32() const
return rtl_ustr_toInt32( mpData->maStr, 10 );
}
-sal_Int64 UniString::ToInt64() const
-{
- DBG_CHKTHIS( UniString, DbgCheckUniString );
-
- return rtl_ustr_toInt64( mpData->maStr, 10 );
-}
-
xub_StrLen STRING::SearchChar( const STRCODE* pChars, xub_StrLen nIndex ) const
{
DBG_CHKTHIS( STRING, DBGCHECKSTRING );
@@ -650,39 +643,6 @@ xub_StrLen STRING::SearchAndReplace( const STRING& rStr, const STRING& rRepStr,
return nSPos;
}
-static sal_Int32 ImplStringICompare( const STRCODE* pStr1, const STRCODE* pStr2 )
-{
- sal_Int32 nRet;
- STRCODE c1;
- STRCODE c2;
- do
- {
- // Convert char if between 'A' and 'Z'
- c1 = *pStr1;
- c2 = *pStr2;
- if ( (c1 >= 65) && (c1 <= 90) )
- c1 += 32;
- if ( (c2 >= 65) && (c2 <= 90) )
- c2 += 32;
- nRet = ((sal_Int32)((STRCODEU)c1))-((sal_Int32)((STRCODEU)c2));
- if ( nRet != 0 )
- break;
-
- ++pStr1,
- ++pStr2;
- }
- while ( c2 );
-
- return nRet;
-}
-
-sal_Bool STRING::EqualsIgnoreCaseAscii( const STRCODE* pCharStr ) const
-{
- DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
- return (ImplStringICompare( mpData->maStr, pCharStr ) == 0);
-}
-
STRING& STRING::Assign( const STRCODE* pCharStr )
{
DBG_CHKTHIS( STRING, DBGCHECKSTRING );