drop unnecessary tools/string includes

Change-Id: I4278999b9b7d184c26036bbe9e3b98420f461e8c

20 files changed, 23 insertions, 35 deletions

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 7fcd1f01a476..f764e083e626 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -21,7 +21,6 @@
 #define SC_ADDRESS_HXX
 
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
 #include <tools/solar.h>
 #include <rtl/ustrbuf.hxx>
 #include <osl/endian.h>
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index 45c74216c865..3094b64ee258 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -22,7 +22,6 @@
 
 #include "address.hxx"
 #include <svl/lstner.hxx>
-#include <tools/string.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainer.hxx>
 
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index c794148e79ce..cacc9ee7ae2f 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -20,8 +20,8 @@
 #ifndef SC_SCDOCPOL_HXX
 #define SC_SCDOCPOL_HXX
 
+#include <rtl/ustring.hxx>
 #include <svl/itempool.hxx>
-#include <tools/string.hxx>
 #include "scdllapi.h"
 
 class ScStyleSheet;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index f7df5f619686..20222fa2130a 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -340,7 +340,7 @@ private:
     LanguageType        eLanguage;                      // default language
     LanguageType        eCjkLanguage;                   // default language for asian text
     LanguageType        eCtlLanguage;                   // default language for complex text
-    CharSet             eSrcSet;                        // during reading: source character set
+    rtl_TextEncoding    eSrcSet;                        // during reading: source character set
 
     /** The compiler grammar used in document storage. GRAM_PODF for ODF 1.1
         documents, GRAM_ODFF for ODF 1.2 documents. */
@@ -1597,11 +1597,11 @@ public:
 
     SC_DLLPUBLIC void           CopyStdStylesFrom( ScDocument* pSrcDoc );
 
-    CharSet         GetSrcCharSet() const   { return eSrcSet; }
+    rtl_TextEncoding GetSrcCharSet() const   { return eSrcSet; }
     sal_uLong           GetSrcVersion() const   { return nSrcVer; }
     SCROW           GetSrcMaxRow() const    { return nSrcMaxRow; }
 
-    void            SetSrcCharSet( CharSet eNew )   { eSrcSet = eNew; }
+    void            SetSrcCharSet( rtl_TextEncoding eNew )   { eSrcSet = eNew; }
     void            UpdateFontCharSet();
 
     void FillInfo(
@@ -1915,7 +1915,7 @@ public:
                 points times sizeof(sal_Unicode) is returned. */
     sal_Int32       GetMaxStringLen( SCTAB nTab, SCCOL nCol,
                                      SCROW nRowStart, SCROW nRowEnd,
-                                     CharSet eCharSet ) const;
+                                     rtl_TextEncoding eCharSet ) const;
     /** Maximum string length of numerical cells of a column, e.g. for dBase export.
         @return String length in characters (!) including the decimal
                 separator, and the decimal precision needed. */
diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx
index 13d9faa2fca0..375e76a2472d 100644
--- a/sc/inc/dpdimsave.hxx
+++ b/sc/inc/dpdimsave.hxx
@@ -22,7 +22,6 @@
 
 #include <vector>
 #include <map>
-#include <tools/string.hxx>
 #include "dpgroup.hxx"      ///< for ScDPNumGroupInfo
 #include "scdllapi.h"
 #include "dptypes.hxx"
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 4017fe119332..4610f20348d0 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -24,7 +24,6 @@
 #include "dpfilteredcache.hxx"
 #include "calcmacros.hxx"
 
-#include <tools/string.hxx>
 #include <com/sun/star/sheet/MemberResult.hpp>
 #include <com/sun/star/sheet/DataResult.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index 60f92121f930..b2d7a4146cf2 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -20,7 +20,6 @@
 #ifndef SC_DPTABSRC_HXX
 #define SC_DPTABSRC_HXX
 
-#include <tools/string.hxx>
 #include "global.hxx"       // enum ScSubTotalFunc
 #include <com/sun/star/sheet/XDimensionsSupplier.hpp>
 #include <com/sun/star/sheet/XHierarchiesSupplier.hpp>
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 6f6607322bd9..2a3b9f59a642 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -20,8 +20,9 @@
 #ifndef SC_FILTER_HXX
 #define SC_FILTER_HXX
 
-#include <tools/string.hxx>
 #include <rtl/textenc.h>
+#include <rtl/ustring.hxx>
+#include <tools/solar.h>
 
 #include "scdllapi.h"
 
@@ -84,7 +85,7 @@ class ScEEAbsImport {
 class ScFormatFilterPlugin {
   public:
     // various import filters
-    virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, CharSet eSrc = RTL_TEXTENCODING_DONTKNOW ) = 0;
+    virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW ) = 0;
     virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ) = 0;
     virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) = 0;
         // eFormat == EIF_AUTO  -> matching filter is used automatically
@@ -93,7 +94,7 @@ class ScFormatFilterPlugin {
         // eFormat == EIF_BIFF_LE4 -> only non storage files _might_ be read successfully
     virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) = 0;
     virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos,
-                 const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
+                 const rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
     virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) = 0;
     virtual FltError ScImportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0,
                                    bool bCalcWidthHeight = true, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
@@ -104,14 +105,14 @@ class ScFormatFilterPlugin {
     virtual OUString       GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ) = 0;
 
     // various export filters
-    virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, CharSet eDest ) = 0;
-    virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const CharSet eDest,
+    virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ) = 0;
+    virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const rtl_TextEncoding eDest,
                                  sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
-    virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest,
+    virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest,
                  sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
-    virtual FltError ScExportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, const ScRange& rRange, const CharSet eDest, bool bAll,
+    virtual FltError ScExportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, bool bAll,
                   const OUString& rStreamPath, OUString& rNonConvertibleChars ) = 0;
-    virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest ) = 0;
+    virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) = 0;
 
     virtual ScOrcusFilters* GetOrcusFilters() = 0;
 
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 4db7beb76753..0698fbc11e34 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -660,8 +660,8 @@ SC_DLLPUBLIC    static xub_StrLen       FindUnquoted( const OUString& rString, s
      */
 SC_DLLPUBLIC    static const sal_Unicode* FindUnquoted( const sal_Unicode* pString, sal_Unicode cChar, sal_Unicode cQuote = '\'' );
 
-    static  CharSet         GetCharsetValue( const OUString& rCharSet );
-    static  OUString        GetCharsetString( CharSet eVal );
+    static  rtl_TextEncoding GetCharsetValue( const OUString& rCharSet );
+    static  OUString        GetCharsetString( rtl_TextEncoding eVal );
 
     /// a "ReadOnly" formatter for UNO/XML export
     static  SvNumberFormatter*  GetEnglishFormatter();
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 9bfc5417dbe7..0b6c53baec4f 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -24,7 +24,6 @@
 #include "global.hxx"
 #include "formula/token.hxx"
 #include <svl/listener.hxx>
-#include <tools/string.hxx>
 
 #include <boost/unordered_map.hpp>
 
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index 317f9aeef18e..cf09d54f5168 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -24,7 +24,6 @@
 #include <svl/itemset.hxx>
 #include <unotools/fontcvt.hxx>
 #include <editeng/svxenum.hxx>
-#include <tools/string.hxx>
 #include "scdllapi.h"
 
 class Font;
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 4ab57094246a..54b944fb6b03 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -937,7 +937,6 @@
 #include <tools/shl.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/wintypes.hxx>
diff --git a/sc/inc/pch/precompiled_vbaobj.hxx b/sc/inc/pch/precompiled_vbaobj.hxx
index 67c8557494ef..c48f0150e2e3 100644
--- a/sc/inc/pch/precompiled_vbaobj.hxx
+++ b/sc/inc/pch/precompiled_vbaobj.hxx
@@ -314,7 +314,6 @@
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/eventcfg.hxx>
 #include <vbahelper/helperdecl.hxx>
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index 4d3194f16f49..3c3c5f8c1bac 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -20,8 +20,8 @@
 #ifndef SC_PROGRESS_HXX
 #define SC_PROGRESS_HXX
 
+#include <rtl/ustring.hxx>
 #include <sfx2/progress.hxx>
-#include <tools/string.hxx>
 #include "scdllapi.h"
 
 class ScDocument;
diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index 26fe5890f37b..3b51c2690664 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -20,8 +20,6 @@
 #ifndef SC_RANGEUTL_HXX
 #define SC_RANGEUTL_HXX
 
-#include <tools/string.hxx>
-
 #include "address.hxx"
 #include "rangenam.hxx"
 #include "dbdata.hxx"
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index fe3cf069183a..d5f6876eb193 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -21,7 +21,6 @@
 #define _SC_ABSTDLG_HXX
 
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <vcl/syswin.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx
index 5984da798094..08e5c1ed0314 100644
--- a/sc/inc/stringutil.hxx
+++ b/sc/inc/stringutil.hxx
@@ -20,10 +20,9 @@
 #ifndef SC_STRINGUTIL_HXX
 #define SC_STRINGUTIL_HXX
 
-#include "rtl/ustring.hxx"
-#include "tools/string.hxx"
+#include <rtl/ustring.hxx>
 #include "scdllapi.h"
-#include "i18nlangtag/lang.h"
+#include <i18nlangtag/lang.h>
 
 class SvNumberFormatter;
 
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx
index f18ee62e2fec..5c37de498be7 100644
--- a/sc/inc/targuno.hxx
+++ b/sc/inc/targuno.hxx
@@ -21,7 +21,6 @@
 #define SC_TARGUNO_HXX
 
 #include <svl/lstner.hxx>
-#include <tools/string.hxx>
 #include <com/sun/star/document/XLinkTargetSupplier.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx
index 0adb00519047..0cecf316bcfc 100644
--- a/sc/inc/userlist.hxx
+++ b/sc/inc/userlist.hxx
@@ -21,6 +21,7 @@
 #define SC_USERLIST_HXX
 
 #include <tools/stream.hxx>
+#include <tools/string.hxx>
 #include "scdllapi.h"
 
 #include <boost/ptr_container/ptr_vector.hpp>
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index c132a8af4410..dfadff3e6443 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -20,7 +20,7 @@
 #ifndef _ZFORAUTO_HXX_
 #define _ZFORAUTO_HXX_
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <i18nlangtag/lang.h>
 
 
@@ -37,8 +37,8 @@ public:
     ScNumFormatAbbrev();
     ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat);
     ScNumFormatAbbrev(sal_uLong nFormat, SvNumberFormatter& rFormatter);
-    void Load( SvStream& rStream, CharSet eByteStrSet );            // loading of the numberformats
-    void Save( SvStream& rStream, CharSet eByteStrSet ) const;   // saving of the numberformats
+    void Load( SvStream& rStream, rtl_TextEncoding eByteStrSet );            // loading of the numberformats
+    void Save( SvStream& rStream, rtl_TextEncoding eByteStrSet ) const;   // saving of the numberformats
     void PutFormatIndex(sal_uLong nFormat, SvNumberFormatter& rFormatter);
     sal_uLong GetFormatIndex( SvNumberFormatter& rFormatter);
     inline int operator==(const ScNumFormatAbbrev& rNumFormat) const