9 files changed, 5 insertions, 9 deletions
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;