---
avmedia/source/gstreamer/gstcommon.hxx | 1 -
avmedia/source/quicktime/quicktimecommon.hxx | 1 -
avmedia/source/win/wincommon.hxx | 1 -
basic/source/sbx/sbxres.cxx | 2 ++
basic/source/sbx/sbxres.hxx | 2 +-
dbaccess/source/core/dataaccess/ModelImpl.hxx | 1 -
dbaccess/source/core/dataaccess/datasource.hxx | 1 -
.../source/inc/OAuthenticationContinuation.hxx | 2 +-
dbaccess/source/ui/browser/formadapter.cxx | 1 -
dbaccess/source/ui/inc/JoinDesignView.hxx | 1 -
dbaccess/source/ui/inc/RelationDesignView.hxx | 1 -
dbaccess/source/ui/inc/TableRow.hxx | 1 -
dbaccess/source/ui/inc/charsets.hxx | 2 +-
desktop/source/app/langselect.hxx | 1 -
.../deployment/gui/dp_gui_dependencydialog.cxx | 1 -
editeng/source/editeng/editdbg.hxx | 1 -
extensions/source/dbpilots/optiongrouplayouter.cxx | 1 -
.../source/plugin/inc/plugin/unx/mediator.hxx | 1 -
extensions/source/propctrlr/eformshelper.hxx | 2 +-
extensions/source/propctrlr/pcrcommon.hxx | 1 -
extensions/source/propctrlr/proplinelistener.hxx | 2 +-
extensions/source/propctrlr/stringdefine.hxx | 1 -
extensions/source/xmlextract/xmxcom.hxx | 1 -
extensions/workben/testcomponent.cxx | 1 -
filter/inc/filter/msfilter/mstoolbar.hxx | 1 -
forms/source/component/imgprod.hxx | 1 -
formula/inc/formula/ExternalReferenceHelper.hxx | 2 +-
fpicker/source/office/fpsmartcontent.cxx | 1 -
framework/inc/framework/eventsconfiguration.hxx | 1 -
framework/inc/framework/statusbarconfiguration.hxx | 1 -
framework/inc/framework/toolboxconfiguration.hxx | 1 -
framework/source/classes/fwlresid.cxx | 1 -
framework/source/fwe/classes/fwkresid.cxx | 1 -
.../uiconfiguration/uicategorydescription.cxx | 1 -
l10ntools/inc/l10ntools/directory.hxx | 1 -
l10ntools/source/directory.cxx | 2 +-
linguistic/source/convdicxml.hxx | 1 -
lotuswordpro/source/filter/lwpheader.hxx | 1 -
reportdesign/source/ui/inc/FunctionHelper.hxx | 1 -
rsc/inc/rscall.h | 1 -
rsc/inc/rscdb.hxx | 1 +
rsc/inc/rsctools.hxx | 3 ++-
sc/inc/dpsave.hxx | 1 -
sc/inc/sortparam.hxx | 1 -
sc/source/core/inc/core_pch.hxx | 1 -
sc/source/filter/inc/biff.hxx | 1 -
sc/source/filter/inc/decl.h | 1 -
sc/source/filter/inc/filt_pch.hxx | 1 -
sc/source/filter/inc/formel.hxx | 1 -
sc/source/filter/inc/qproform.hxx | 1 -
sc/source/filter/xml/sheetdata.cxx | 2 +-
sc/source/ui/inc/formdata.hxx | 1 -
sc/source/ui/inc/ui_pch.hxx | 1 -
sc/source/ui/unoobj/scdetect.hxx | 1 -
sc/source/ui/unoobj/unodoc.cxx | 2 +-
sd/source/ui/dlg/sdabstdlg.cxx | 2 +-
sd/source/ui/inc/unokywds.hxx | 1 -
.../toolpanel/controls/RecentlyUsedMasterPages.hxx | 1 -
sd/source/ui/unoidl/sddetect.hxx | 1 -
sd/source/ui/unoidl/unodoc.cxx | 2 +-
sfx2/inc/frmload.hxx | 1 -
sfx2/inc/sfx2/sfxresid.hxx | 1 -
sfx2/source/dialog/sfxdlg.cxx | 1 -
sfx2/source/doc/SfxDocumentMetaData.cxx | 1 -
starmath/source/smdetect.hxx | 1 -
starmath/source/unodoc.cxx | 1 -
svl/source/items/cntwall.cxx | 1 -
svl/source/memtools/svarray.cxx | 1 -
svtools/inc/svtools/accessibilityoptions.hxx | 1 -
svtools/source/contnr/treelist.cxx | 1 -
svtools/source/misc/wallitem.cxx | 1 -
svtools/workben/cui/loadlib.cxx | 1 -
svx/inc/svx/fmsrccfg.hxx | 1 -
svx/inc/svx/msdffdef.hxx | 1 -
svx/inc/svx/sdrhittesthelper.hxx | 1 -
svx/inc/svx/svdsob.hxx | 4 ----
svx/source/accessibility/ShapeTypeHandler.cxx | 1 -
svx/source/form/fmtools.cxx | 1 -
svx/source/inc/fmvwimp.hxx | 1 -
svx/source/smarttags/SmartTagMgr.cxx | 1 -
sw/inc/SwNumberTree.hxx | 1 -
sw/inc/index.hxx | 1 -
sw/inc/splargs.hxx | 1 -
sw/inc/unocoll.hxx | 1 -
sw/source/core/SwNumberTree/SwNumberTree.cxx | 1 +
sw/source/core/bastyp/index.cxx | 1 +
sw/source/core/inc/mvsave.hxx | 1 -
sw/source/core/text/wrong.cxx | 1 -
sw/source/filter/html/css1kywd.hxx | 2 +-
sw/source/filter/html/htmlfly.hxx | 1 -
sw/source/ui/app/mainwn.cxx | 1 -
toolkit/source/controls/unocontrol.cxx | 1 -
toolkit/source/controls/unocontrolmodel.cxx | 1 -
tools/bootstrp/cppdep.hxx | 1 -
tools/inc/tools/multisel.hxx | 2 +-
tools/inc/tools/urlobj.hxx | 1 -
tools/source/fsys/wntmsc.hxx | 1 -
unotools/inc/unotools/useroptions.hxx | 1 -
unotools/source/misc/syslocale.cxx | 1 -
vcl/inc/unx/salstd.hxx | 1 -
vcl/inc/unx/sm.hxx | 1 +
vcl/inc/vcl/gdimtf.hxx | 1 -
vcl/inc/vcl/prntypes.hxx | 1 -
vcl/inc/vcl/sound.hxx | 1 -
vcl/unx/generic/gdi/salgdi3.cxx | 1 -
vcl/win/source/app/salinfo.cxx | 1 -
xmloff/inc/xmloff/xmlkywd.hxx | 2 --
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 3 ---
xmloff/source/core/xmlerror.cxx | 1 -
xmloff/source/draw/propimp0.cxx | 1 -
xmloff/source/draw/sdxmlimp.cxx | 2 +-
xmloff/source/meta/MetaImportComponent.cxx | 1 -
xmloff/source/meta/xmlversion.cxx | 1 -
xmloff/source/text/txtimppr.cxx | 2 +-
xmloff/source/text/txtparai.cxx | 1 -
.../xmlsec/nss/securityenvironment_nssimpl.cxx | 2 +-
xmlsecurity/tools/demo/util.cxx | 1 -
117 files changed, 24 insertions(+), 118 deletions(-)
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
index 1d9b5ca..d7aa082 100644
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
@@ -34,7 +34,6 @@
#include <osl/mutex.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <tools/urlobj.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index 3ea131d..c2a9c7b 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -42,7 +42,6 @@
#endif
#include <tools/debug.hxx>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx>
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index c90339b..66d9164 100644
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
@@ -33,7 +33,6 @@
#include <rtl/ustring.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx>
diff --git a/basic/source/sbx/sbxres.cxx b/basic/source/sbx/sbxres.cxx
index 84bb602..1648bca 100644
--- a/basic/source/sbx/sbxres.cxx
+++ b/basic/source/sbx/sbxres.cxx
@@ -29,6 +29,8 @@
#include "sbxres.hxx"
+#include <rtl/ustring.hxx>
+
static const char* pSbxRes[] = {
"Empty",
"Null",
diff --git a/basic/source/sbx/sbxres.hxx b/basic/source/sbx/sbxres.hxx
index c50b197..08396f5 100644
--- a/basic/source/sbx/sbxres.hxx
+++ b/basic/source/sbx/sbxres.hxx
@@ -29,7 +29,7 @@
#ifndef _SBXRES_HXX
#define _SBXRES_HXX
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
// Currently there are no resources provided in the SVTOOLS-Project.
// Because it is non-critical resources (BASIC-Keywords),
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 804e2f9..874b2f2 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -79,7 +79,6 @@
#include <cppuhelper/weakref.hxx>
#include <sfx2/docmacromode.hxx>
#include <sfx2/docstoragemodifylistener.hxx>
-#include <tools/string.hxx>
#include <unotools/sharedunocomponent.hxx>
#include <osl/mutex.hxx>
#include <rtl/ref.hxx>
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx
index 88cb631..0ded171 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -47,7 +47,6 @@
#include "apitools.hxx"
#include "bookmarkcontainer.hxx"
#include <rtl/ref.hxx>
-#include <tools/string.hxx>
#include <connectivity/CommonTools.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx
index 743772c..2a72fb8 100644
--- a/dbaccess/source/inc/OAuthenticationContinuation.hxx
+++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/ucb/RememberAuthentication.hpp>
#include <com/sun/star/uno/Sequence.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <comphelper/interaction.hxx>
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index 874a4e7..3fa5d94 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -33,7 +33,6 @@
#include <comphelper/types.hxx>
#include <comphelper/enumhelper.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <tools/string.hxx>
#include "dbu_brw.hrc"
#include "dbustrings.hrc"
#include <cppuhelper/typeprovider.hxx>
diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx
index ce67cc1..b321ab9 100644
--- a/dbaccess/source/ui/inc/JoinDesignView.hxx
+++ b/dbaccess/source/ui/inc/JoinDesignView.hxx
@@ -33,7 +33,6 @@
#ifndef _VECTOR_
#include <vector>
#endif
-#include <tools/string.hxx>
#include "QEnumTypes.hxx"
#include <memory>
diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx
index 423885b..901fb2c 100644
--- a/dbaccess/source/ui/inc/RelationDesignView.hxx
+++ b/dbaccess/source/ui/inc/RelationDesignView.hxx
@@ -33,7 +33,6 @@
#ifndef _VECTOR_
#include <vector>
#endif
-#include <tools/string.hxx>
#include "QEnumTypes.hxx"
#include "RelationTableView.hxx"
diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx
index 9e02a0d..3d336bb 100644
--- a/dbaccess/source/ui/inc/TableRow.hxx
+++ b/dbaccess/source/ui/inc/TableRow.hxx
@@ -29,7 +29,6 @@
#define DBAUI_TABLEROW_HXX
#include <comphelper/stl_types.hxx>
-#include <tools/string.hxx>
#include <tools/stream.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include "TypeInfo.hxx"
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx
index 89fa3d4..9798255 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -29,8 +29,8 @@
#ifndef _DBAUI_CHARSETS_HXX_
#define _DBAUI_CHARSETS_HXX_
-#include <tools/string.hxx>
#include <connectivity/dbcharset.hxx>
+#include <rtl/ustring.hxx>
#include <svx/txenctab.hxx>
//.........................................................................
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index fdb229a..2fd8074 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -28,7 +28,6 @@
#include <list>
#include <sal/types.h>
-#include <tools/string.hxx>
#include <rtl/ustring.hxx>
#include <tools/resid.hxx>
#include <com/sun/star/lang/Locale.hpp>
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 314660a..cc3e168 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -36,7 +36,6 @@
#include "tools/gen.hxx"
#include "tools/resid.hxx"
#include "tools/solar.h"
-#include "tools/string.hxx"
#include "vcl/dialog.hxx"
#include "dp_gui.hrc"
diff --git a/editeng/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx
index c7f6e98..f208981 100644
--- a/editeng/source/editeng/editdbg.hxx
+++ b/editeng/source/editeng/editdbg.hxx
@@ -30,7 +30,6 @@
#define _EDITDBG_HXX
#include <svl/solar.hrc>
-#include <tools/string.hxx>
#include <stdio.h>
class EditEngine;
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index 03da1a8c6..1d1a1fc 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -28,7 +28,6 @@
#include "optiongrouplayouter.hxx"
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index 6a0dd05..6e249e0c 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -30,7 +30,6 @@
#include <string.h>
#include <stdarg.h>
-#include <tools/string.hxx>
#include <tools/link.hxx>
#include <osl/pipe.hxx>
#include <osl/mutex.hxx>
diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx
index ba6c3ca..3d2d8d8 100644
--- a/extensions/source/propctrlr/eformshelper.hxx
+++ b/extensions/source/propctrlr/eformshelper.hxx
@@ -40,7 +40,7 @@
#include <com/sun/star/form/binding/XListEntrySource.hpp>
/** === end UNO includes === **/
#include <osl/mutex.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <comphelper/listenernotification.hxx>
#include <vector>
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index 528c88d..3a96026 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -38,7 +38,6 @@
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
/** === end UNO includes === **/
-#include <tools/string.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/listenernotification.hxx>
diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx
index 79eeaee..4d72352 100644
--- a/extensions/source/propctrlr/proplinelistener.hxx
+++ b/extensions/source/propctrlr/proplinelistener.hxx
@@ -29,7 +29,7 @@
#ifndef _EXTENSIONS_PROPCTRLR_PROPLINELISTENER_HXX_
#define _EXTENSIONS_PROPCTRLR_PROPLINELISTENER_HXX_
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
//........................................................................
namespace pcr
diff --git a/extensions/source/propctrlr/stringdefine.hxx b/extensions/source/propctrlr/stringdefine.hxx
index e5a27ca..2394c98 100644
--- a/extensions/source/propctrlr/stringdefine.hxx
+++ b/extensions/source/propctrlr/stringdefine.hxx
@@ -30,7 +30,6 @@
#define _EXTENSIONS_FORMSCTRLR_STRINGDEFINE_HXX_
#include <rtl/ustring.hxx>
-#include <tools/string.hxx>
//............................................................................
namespace pcr
diff --git a/extensions/source/xmlextract/xmxcom.hxx b/extensions/source/xmlextract/xmxcom.hxx
index 515a0e2..2afc4eb 100644
--- a/extensions/source/xmlextract/xmxcom.hxx
+++ b/extensions/source/xmlextract/xmxcom.hxx
@@ -33,7 +33,6 @@
#include <rtl/ustring.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Reference.h>
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index 4212c2e..a8e08e1 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@ -43,7 +43,6 @@
#include <usr/services.hxx>
#include <vcl/svapp.hxx>
#include <usr/ustring.hxx>
-#include <tools/string.hxx>
#include <osl/conditn.hxx>
#include <smart/com/sun/star/test/XSimpleTest.hxx>
diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/filter/inc/filter/msfilter/mstoolbar.hxx
index 6cb7ef4..ccbefb2 100644
--- a/filter/inc/filter/msfilter/mstoolbar.hxx
+++ b/filter/inc/filter/msfilter/mstoolbar.hxx
@@ -31,7 +31,6 @@
#ifndef _MSTOOLBAR_HXX
#define _MSTOOLBAR_HXX
#include "filter/msfilter/msfilterdllapi.h"
-#include <tools/string.hxx>
#include <sot/storage.hxx>
#include <ostream>
#include <memory>
diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx
index 53d673c..00cf032 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -32,7 +32,6 @@
#include <boost/ptr_container/ptr_vector.hpp>
#include <tools/link.hxx>
-#include <tools/string.hxx>
#include <com/sun/star/awt/ImageStatus.hpp>
#include <com/sun/star/awt/XImageConsumer.hpp>
#include <com/sun/star/awt/XImageProducer.hpp>
diff --git a/formula/inc/formula/ExternalReferenceHelper.hxx b/formula/inc/formula/ExternalReferenceHelper.hxx
index f0f946a..68d2860 100644
--- a/formula/inc/formula/ExternalReferenceHelper.hxx
+++ b/formula/inc/formula/ExternalReferenceHelper.hxx
@@ -29,7 +29,7 @@
#ifndef FORMULA_EXTERNALREFERENCEHELPER_HXX
#define FORMULA_EXTERNALREFERENCEHELPER_HXX
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include "formula/formuladllapi.h"
namespace formula
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index 49692ac..0e4c9fe 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -39,7 +39,6 @@
#include <ucbhelper/commandenvironment.hxx>
#include <tools/solar.h>
#include <tools/debug.hxx>
-#include <tools/string.hxx>
//........................................................................
namespace svt
diff --git a/framework/inc/framework/eventsconfiguration.hxx b/framework/inc/framework/eventsconfiguration.hxx
index 3a67873..f02beed 100644
--- a/framework/inc/framework/eventsconfiguration.hxx
+++ b/framework/inc/framework/eventsconfiguration.hxx
@@ -31,7 +31,6 @@
#include <framework/fwedllapi.h>
#include <svl/svarray.hxx>
-#include <tools/string.hxx>
#include <tools/stream.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/framework/inc/framework/statusbarconfiguration.hxx b/framework/inc/framework/statusbarconfiguration.hxx
index 710f092..b357998 100644
--- a/framework/inc/framework/statusbarconfiguration.hxx
+++ b/framework/inc/framework/statusbarconfiguration.hxx
@@ -30,7 +30,6 @@
#include <framework/fwedllapi.h>
#include <svl/svarray.hxx>
-#include <tools/string.hxx>
#include <tools/stream.hxx>
#include <vcl/status.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/framework/inc/framework/toolboxconfiguration.hxx b/framework/inc/framework/toolboxconfiguration.hxx
index 63abfcd..8252840 100644
--- a/framework/inc/framework/toolboxconfiguration.hxx
+++ b/framework/inc/framework/toolboxconfiguration.hxx
@@ -31,7 +31,6 @@
#include <framework/fwedllapi.h>
#include <svl/svarray.hxx>
#include <vcl/bitmap.hxx>
-#include <tools/string.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#ifndef _COM_SUN_STAR_IO_XOUPUTSTREAM_HPP_
#include <com/sun/star/io/XOutputStream.hpp>
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
index b61bfd0..5aa46a7 100644
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -28,7 +28,6 @@
#include "classes/fwlresid.hxx"
-#include <tools/string.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index 0c0a9d4..4e58056 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -28,7 +28,6 @@
#include "classes/fwkresid.hxx"
-#include <tools/string.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 83c006b..c955565 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -54,7 +54,6 @@
#include <rtl/ustrbuf.hxx>
#include <cppuhelper/implbase2.hxx>
#include <unotools/configmgr.hxx>
-#include <tools/string.hxx>
#include <vcl/mnemonic.hxx>
#include <comphelper/sequence.hxx>
diff --git a/l10ntools/inc/l10ntools/directory.hxx b/l10ntools/inc/l10ntools/directory.hxx
index 34e4a3a..ba2590f 100644
--- a/l10ntools/inc/l10ntools/directory.hxx
+++ b/l10ntools/inc/l10ntools/directory.hxx
@@ -2,7 +2,6 @@
#include <vector>
#include <algorithm>
#include <rtl/ustring.hxx>
-#include <tools/string.hxx>
#ifdef WNT
#else
diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
index 836f80f..ce150a4 100644
--- a/l10ntools/source/directory.cxx
+++ b/l10ntools/source/directory.cxx
@@ -33,7 +33,7 @@
#endif
#include <l10ntools/directory.hxx>
-#include "tools/string.hxx"
+#include <rtl/ustring.hxx>
#include <iostream>
#include <vector>
#include <algorithm>
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index 6e9026e..3d52b0f 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -39,7 +39,6 @@
#include <xmloff/xmlimp.hxx>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/interfacecontainer.h>
-#include <tools/string.hxx>
#include <rtl/ustring.hxx>
#include "linguistic/misc.hxx"
#include "defs.hxx"
diff --git a/lotuswordpro/source/filter/lwpheader.hxx b/lotuswordpro/source/filter/lwpheader.hxx
index 36c1770..37e13c3 100644
--- a/lotuswordpro/source/filter/lwpheader.hxx
+++ b/lotuswordpro/source/filter/lwpheader.hxx
@@ -78,7 +78,6 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
-#include <tools/string.hxx>
#include <memory.h>
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx
index e59be1a..c7902aa 100644
--- a/reportdesign/source/ui/inc/FunctionHelper.hxx
+++ b/reportdesign/source/ui/inc/FunctionHelper.hxx
@@ -35,7 +35,6 @@
#include <com/sun/star/report/meta/XFunctionDescription.hpp>
#include <vector>
#include <boost/shared_ptr.hpp>
-#include <tools/string.hxx>
#include <comphelper/stl_types.hxx>
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index 6d33911..8bbe047 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.h
@@ -28,7 +28,6 @@
#ifndef _RSCALL_H
#define _RSCALL_H
-#include <tools/string.hxx>
#include <rsctools.hxx>
#include <rscerror.h>
#include <rscdef.hxx>
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 2a5f606..c7a4950 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -37,6 +37,7 @@
#include <rscstr.hxx>
#include <rscarray.hxx>
#include <rscdef.hxx>
+#include <tools/string.hxx>
#include <vector>
#include <map>
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index c326b1c..ba266de 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -35,8 +35,9 @@ class RscPtrPtr;
#include <stdlib.h>
#endif
#include <stdio.h>
-#include <tools/string.hxx>
#include <vector>
+#include <tools/solar.h>
+#include <rtl/ustring.hxx>
/******************* T y p e s *******************************************/
// Zeichensatz
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 5e3c7c9..fc16b49 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -39,7 +39,6 @@
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
#include <rtl/ustring.hxx>
#include <sal/types.h>
-#include <tools/string.hxx>
#include "scdllapi.h"
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index 2a27064..f1d4e21 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -30,7 +30,6 @@
#define SC_SORTPARAM_HXX
#include "address.hxx"
-#include <tools/string.hxx>
#include <tools/solar.h>
#include <com/sun/star/lang/Locale.hpp>
#include "scdllapi.h"
diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx
index 3b0dd3e..8bb1f0f 100644
--- a/sc/source/core/inc/core_pch.hxx
+++ b/sc/source/core/inc/core_pch.hxx
@@ -37,7 +37,6 @@
#include <tools/solar.h>
#include <string.h>
-#include <tools/string.hxx>
#include <tools/rtti.hxx>
#include <limits.h>
#include <tools/ref.hxx>
diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx
index a6de6bd..0a02fa0 100644
--- a/sc/source/filter/inc/biff.hxx
+++ b/sc/source/filter/inc/biff.hxx
@@ -34,7 +34,6 @@
#include "filter.hxx"
#include "document.hxx"
#include "cell.hxx"
-#include <tools/string.hxx>
#include "flttypes.hxx"
#include "ftools.hxx"
diff --git a/sc/source/filter/inc/decl.h b/sc/source/filter/inc/decl.h
index 91157cf..54a1d0e 100644
--- a/sc/source/filter/inc/decl.h
+++ b/sc/source/filter/inc/decl.h
@@ -31,7 +31,6 @@
#define SC_DECL_H
#include <tools/solar.h>
-#include <tools/string.hxx>
enum WKTYP { eWK_UNKNOWN = -2, eWK_1 = 0, eWK_2, eWK3, eWK4, eWK_Error, eWK123 };
typedef void ( BEARBFKT )( void );
diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx
index 2672dc7..ac73821 100644
--- a/sc/source/filter/inc/filt_pch.hxx
+++ b/sc/source/filter/inc/filt_pch.hxx
@@ -36,7 +36,6 @@
#define SC_PROGRESS_CXX
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <rtl/textenc.h>
#include <sal/types.h>
#include <sal/config.h>
diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index d5b9ac9..9208859 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -30,7 +30,6 @@
#define SC_FORMEL_HXX
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <compiler.hxx>
#include <global.hxx>
diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx
index 6e06827..bc222fa 100644
--- a/sc/source/filter/inc/qproform.hxx
+++ b/sc/source/filter/inc/qproform.hxx
@@ -32,7 +32,6 @@
#include <sal/config.h>
#include "formel.hxx"
-#include <tools/string.hxx>
#include "qpro.hxx"
#include <compiler.hxx>
diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx
index f21676f..747b8db 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -29,10 +29,10 @@
// INCLUDE ---------------------------------------------------------------
+#include <rtl/ustring.hxx>
#include <xmloff/families.hxx>
#include <xmloff/xmlaustp.hxx>
#include <xmloff/nmspmap.hxx>
-#include <tools/string.hxx>
#include "sheetdata.hxx"
diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx
index 3958093..c220a96 100644
--- a/sc/source/ui/inc/formdata.hxx
+++ b/sc/source/ui/inc/formdata.hxx
@@ -29,7 +29,6 @@
#ifndef SC_FORMDATA_HXX
#define SC_FORMDATA_HXX
-#include <tools/string.hxx>
#include <tools/gen.hxx>
#include <formula/formdata.hxx>
class ScInputHandler;
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index 9be80b5..318071d 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/sc/source/ui/inc/ui_pch.hxx
@@ -36,7 +36,6 @@
#define _INPUTHDL_CXX
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <svl/solar.hrc>
#include <tools/rtti.hxx>
#include <string.h>
diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx
index 0079fdb..85f214c 100644
--- a/sc/source/ui/unoobj/scdetect.hxx
+++ b/sc/source/ui/unoobj/scdetect.hxx
@@ -39,7 +39,6 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <cppuhelper/factory.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
class SfxObjectFactory;
class SfxFilterMatcher;
diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx
index 5c59e59..616d03f 100644
--- a/sc/source/ui/unoobj/unodoc.cxx
+++ b/sc/source/ui/unoobj/unodoc.cxx
@@ -29,7 +29,7 @@
// System - Includes -----------------------------------------------------
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/sfxmodelfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index a0110fa..c5f68ff 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -30,7 +30,7 @@
#include "sdabstdlg.hxx"
#include <osl/module.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <vcl/unohelp.hxx>
typedef SdAbstractDialogFactory* (__LOADONCALLAPI *SdFuncPtrCreateDialogFactory)();
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 56f3f93..89c77b2 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -29,7 +29,6 @@
#ifndef _SD_UNOKYWDS_HXX_
#define _SD_UNOKYWDS_HXX_
-#include <tools/string.hxx>
#include <tools/solar.h>
#ifndef SD_DEFINE_KEYWORDS
diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
index 592cfd0..5e5367a 100644
--- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
@@ -34,7 +34,6 @@
#include <tools/link.hxx>
#include <vcl/image.hxx>
#include <vector>
-#include <tools/string.hxx>
#include "DrawDocShell.hxx"
#include "MasterPageContainer.hxx"
diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx
index 814cb49..1236436 100644
--- a/sd/source/ui/unoidl/sddetect.hxx
+++ b/sd/source/ui/unoidl/sddetect.hxx
@@ -40,7 +40,6 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <cppuhelper/factory.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
class SfxObjectFactory;
class SfxFilterMatcher;
diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx
index 885d975..09ef57e 100644
--- a/sd/source/ui/unoidl/unodoc.cxx
+++ b/sd/source/ui/unoidl/unodoc.cxx
@@ -29,7 +29,7 @@
// System - Includes -----------------------------------------------------
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/sfxmodelfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index a35ce9d..3a7df31 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -53,7 +53,6 @@
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/factory.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
#include <comphelper/componentcontext.hxx>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/sfx2/inc/sfx2/sfxresid.hxx b/sfx2/inc/sfx2/sfxresid.hxx
index 32e929e..42a5593 100644
--- a/sfx2/inc/sfx2/sfxresid.hxx
+++ b/sfx2/inc/sfx2/sfxresid.hxx
@@ -28,7 +28,6 @@
#ifndef _SFX_SFXRESID_HXX
#define _SFX_SFXRESID_HXX
-#include <tools/string.hxx>
#include "sfx2/dllapi.h"
#include <tools/resid.hxx>
diff --git a/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx
index 32ab862..37d952f 100644
--- a/sfx2/source/dialog/sfxdlg.cxx
+++ b/sfx2/source/dialog/sfxdlg.cxx
@@ -31,7 +31,6 @@
//#include "cuilib.hxx"
#include <osl/module.hxx>
-#include <tools/string.hxx>
SfxAbstractDialogFactory* SfxAbstractDialogFactory::Create()
{
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 8f029ee..05f98b4 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -67,7 +67,6 @@
#include "SfxDocumentMetaData.hxx"
#include "rtl/ustrbuf.hxx"
#include "tools/debug.hxx"
-#include "tools/string.hxx" // for DBG
#include "tools/datetime.hxx"
#include "osl/mutex.hxx"
#include "cppuhelper/basemutex.hxx"
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index ae5fc38..3513bb6 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -40,7 +40,6 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <cppuhelper/factory.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
class SfxObjectFactory;
class SfxFilterMatcher;
diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index 2e992dc..81d736f 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -29,7 +29,6 @@
// System - Includes -----------------------------------------------------
-#include <tools/string.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/sfxmodelfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index 245596e..76660e0 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
@@ -28,7 +28,6 @@
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <tools/stream.hxx>
#include <tools/vcompat.hxx>
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 89f6ab1..fa48f58 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -48,7 +48,6 @@
#define _SVSTDARR_XUB_STRLEN
#include <svl/svstdarr.hxx>
-#include <tools/string.hxx>
#include <tools/debug.hxx>
SV_IMPL_VARARR(SvPtrarr,VoidPtr)
diff --git a/svtools/inc/svtools/accessibilityoptions.hxx b/svtools/inc/svtools/accessibilityoptions.hxx
index 1c21994..7038bac 100644
--- a/svtools/inc/svtools/accessibilityoptions.hxx
+++ b/svtools/inc/svtools/accessibilityoptions.hxx
@@ -30,7 +30,6 @@
#include "svtools/svtdllapi.h"
#include <unotools/configitem.hxx>
-#include <tools/string.hxx>
#include <svl/brdcst.hxx>
#include <svl/lstner.hxx>
#include <unotools/options.hxx>
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index f4a081f..51a0d1e 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -28,7 +28,6 @@
#include <svtools/treelist.hxx>
-
DBG_NAME(SvListEntry);
SvListEntry::SvListEntry()
diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx
index 294b002..2f0edaf 100644
--- a/svtools/source/misc/wallitem.cxx
+++ b/svtools/source/misc/wallitem.cxx
@@ -36,7 +36,6 @@
#include <tools/stream.hxx>
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
diff --git a/svtools/workben/cui/loadlib.cxx b/svtools/workben/cui/loadlib.cxx
index f3d4f8d..6b4c116 100644
--- a/svtools/workben/cui/loadlib.cxx
+++ b/svtools/workben/cui/loadlib.cxx
@@ -31,7 +31,6 @@
#include <string.h>
#include <stdlib.h>
-#include <tools/string.hxx>
#include <osl/module.h>
#include <rtl/ustring.hxx>
diff --git a/svx/inc/svx/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx
index 08a5dfd..e178e83 100644
--- a/svx/inc/svx/fmsrccfg.hxx
+++ b/svx/inc/svx/fmsrccfg.hxx
@@ -29,7 +29,6 @@
#ifndef _FMSRCCF_HXX_
#define _FMSRCCF_HXX_
-#include <tools/string.hxx>
#include <unotools/configvaluecontainer.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index 1d86986..42acdbb 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -32,7 +32,6 @@
#include <tools/solar.h>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <tools/gen.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/sdrhittesthelper.hxx b/svx/inc/svx/sdrhittesthelper.hxx
index 88e08a4..acb8717 100644
--- a/svx/inc/svx/sdrhittesthelper.hxx
+++ b/svx/inc/svx/sdrhittesthelper.hxx
@@ -30,7 +30,6 @@
#define _SDRHITTESTHELPER_HXX
#include "svx/svxdllapi.h"
-#include <tools/string.hxx>
#include <tools/gen.hxx>
/////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/svdsob.hxx b/svx/inc/svx/svdsob.hxx
index c995516..5764abe 100644
--- a/svx/inc/svx/svdsob.hxx
+++ b/svx/inc/svx/svdsob.hxx
@@ -32,10 +32,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <tools/stream.hxx>
-#ifndef _STRING_H
-#include <tools/string.hxx> //wg. memset
-#define _STRING_H
-#endif
#include "svx/svxdllapi.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 291c7aa..da66296 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -200,7 +200,6 @@ bool ShapeTypeHandler::AddShapeTypeList (int nDescriptorCount,
-#include <tools/string.hxx>
long ShapeTypeHandler::GetSlotId (const OUString& aServiceName) const
{
tServiceNameToSlotId::iterator I (maServiceNameToSlotId.find (aServiceName));
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 610de4d..c68cfef 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -91,7 +91,6 @@
#include <svl/stritem.hxx>
#include <toolkit/unohlp.hxx>
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 81332aa..f76c69d 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -47,7 +47,6 @@
#include <comphelper/stl_types.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
#include <comphelper/uno3.hxx>
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 97445a4..7eeff0e 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -51,7 +51,6 @@
#include <com/sun/star/util/XChangesNotifier.hpp>
#include <comphelper/processfactory.hxx>
#include <rtl/ustring.hxx>
-#include <tools/string.hxx>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 1508acc..00256ab 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -31,7 +31,6 @@
#include <set>
#include <vector>
-#include <tools/string.hxx>
#include <swdllapi.h>
#include <SwNumberTreeTypes.hxx>
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index a671e04..329fcb4 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -33,7 +33,6 @@
#include "rtl/instance.hxx"
#include <tools/solar.h>
#include <tools/rtti.hxx> // for RTTI of SwIndexReg
-#include <tools/string.hxx> // for xub_StrLen
#include <swdllapi.h>
// Maximum index in IndexArray (for testing on overflows).
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 839f357..ee86352 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -32,7 +32,6 @@
#include <tools/solar.h>
#include <tools/gen.hxx>
#include <limits.h> // USHRT_MAX
-#include <tools/string.hxx>
class SwTxtNode;
class SwIndex;
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 0449bab..07596e0 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -34,7 +34,6 @@
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
-#include <tools/string.hxx>
#include <cppuhelper/implbase1.hxx> // helper for implementations
#include <cppuhelper/implbase2.hxx> // helper for implementations
#include <cppuhelper/implbase3.hxx> // helper for implementations
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 2f20150..bc34218 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -30,6 +30,7 @@
#include <algorithm>
#include <functional>
#include <SwNumberTree.hxx>
+#include <osl/diagnose.h>
using std::vector;
using std::find;
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 70b5712..88ee1d3 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -30,6 +30,7 @@
#include <assert.h>
#include <stdlib.h> // fuer qsort
#include <tools/solar.h>
+#include <tools/string.hxx>
#include "index.hxx"
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 37ebc5b..0fdac74 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -28,7 +28,6 @@
#ifndef SW_MVSAVE_HXX
#define SW_MVSAVE_HXX
-#include <tools/string.hxx>
#include <vcl/keycod.hxx>
#include <svl/svarray.hxx>
#include <IDocumentMarkAccess.hxx>
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 4ef3428..6764f05 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -28,7 +28,6 @@
-#include <tools/string.hxx>
#include "swtypes.hxx"
#include "txttypes.hxx"
diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx
index 2c4d0dc..9628289 100644
--- a/sw/source/filter/html/css1kywd.hxx
+++ b/sw/source/filter/html/css1kywd.hxx
@@ -29,7 +29,7 @@
#ifndef _CSS1KYWD_HXX
#define _CSS1KYWD_HXX
-#include <tools/string.hxx>
+#include <sal/types.h>
#ifndef CSS1_CONSTASCII_DECL
#define CSS1_CONSTASCII_DECL( n, s ) n[sizeof(s)]
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index e18cfcc..ff86a53 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -30,7 +30,6 @@
#define _HTMLFLY_HXX
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <svl/svarray.hxx>
diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx
index c4c0124..ba73043 100644
--- a/sw/source/ui/app/mainwn.cxx
+++ b/sw/source/ui/app/mainwn.cxx
@@ -31,7 +31,6 @@
#include <mdiexp.hxx>
#include <tools/shl.hxx>
-#include <tools/string.hxx>
#include <svl/svstdarr.hxx>
#include <sfx2/progress.hxx>
#include <tools/resid.hxx>
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index e5bb98f..98e6392 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -39,7 +39,6 @@
#include <rtl/memory.h>
#include <rtl/uuid.h>
#include <osl/mutex.hxx>
-#include <tools/string.hxx>
#include <tools/table.hxx>
#include <tools/date.hxx>
#include <tools/debug.hxx>
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 2993b6a..9c731d2 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -43,7 +43,6 @@
#include <rtl/memory.h>
#include <rtl/uuid.h>
#include <tools/diagnose_ex.h>
-#include <tools/string.hxx>
#include <tools/table.hxx>
#include <tools/date.hxx>
#include <tools/time.hxx>
diff --git a/tools/bootstrp/cppdep.hxx b/tools/bootstrp/cppdep.hxx
index 3ed2942..62900c7 100644
--- a/tools/bootstrp/cppdep.hxx
+++ b/tools/bootstrp/cppdep.hxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#include <tools/string.hxx>
#include <vector>
#define PATH_SEP ":"
#define DIR_SEP "/"
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index 47f56f2..20f1c63 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -30,7 +30,7 @@
#include "tools/toolsdllapi.h"
#include <tools/gen.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <vector>
#include <set>
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index e8ac79a..b49d026 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -29,7 +29,6 @@
#define _URLOBJ_HXX
#include "tools/toolsdllapi.h"
-#include <tools/string.hxx>
#include "com/sun/star/uno/Reference.hxx"
#include "rtl/string.h"
#include "rtl/ustrbuf.hxx"
diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx
index 5137d99..b7b3391 100644
--- a/tools/source/fsys/wntmsc.hxx
+++ b/tools/source/fsys/wntmsc.hxx
@@ -41,7 +41,6 @@
#include <windows.h>
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <rtl/strbuf.hxx>
//--------------------------------------------------------------------
diff --git a/unotools/inc/unotools/useroptions.hxx b/unotools/inc/unotools/useroptions.hxx
index 2467fd2..c511342 100644
--- a/unotools/inc/unotools/useroptions.hxx
+++ b/unotools/inc/unotools/useroptions.hxx
@@ -30,7 +30,6 @@
#include "unotools/unotoolsdllapi.h"
#include <unotools/configitem.hxx>
-#include <tools/string.hxx>
#include <osl/mutex.hxx>
#include <unotools/options.hxx>
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index 50d5664..79aaa39 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -28,7 +28,6 @@
#include <unotools/syslocale.hxx>
-#include <tools/string.hxx>
#include <unotools/syslocaleoptions.hxx>
#include <unotools/localedatawrapper.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/vcl/inc/unx/salstd.hxx b/vcl/inc/unx/salstd.hxx
index 07056a9..e21115c 100644
--- a/vcl/inc/unx/salstd.hxx
+++ b/vcl/inc/unx/salstd.hxx
@@ -31,7 +31,6 @@
// -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#include <tools/ref.hxx>
-#include <tools/string.hxx>
#include <tools/gen.hxx>
#include <vcl/sv.h>
diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx
index d940bcf..0dfc463 100644
--- a/vcl/inc/unx/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -29,6 +29,7 @@
#define _VCL_SM_HXX
#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
#include "tools/link.hxx"
#include "unx/salunx.h"
#include <X11/SM/SMlib.h>
diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index aaf0012..6c682bd 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -32,7 +32,6 @@
#include <vcl/dllapi.h>
#include <tools/gen.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
#include <vcl/mapmod.hxx>
#include <vector>
diff --git a/vcl/inc/vcl/prntypes.hxx b/vcl/inc/vcl/prntypes.hxx
index 13d87a9..f1c05b5 100644
--- a/vcl/inc/vcl/prntypes.hxx
+++ b/vcl/inc/vcl/prntypes.hxx
@@ -29,7 +29,6 @@
#ifndef _SV_PRNTYPES_HXX
#define _SV_PRNTYPES_HXX
-#include <tools/string.hxx>
#include <vcl/sv.h>
#include <i18npool/paper.hxx>
diff --git a/vcl/inc/vcl/sound.hxx b/vcl/inc/vcl/sound.hxx
index a4c2a3d..344d1a7 100644
--- a/vcl/inc/vcl/sound.hxx
+++ b/vcl/inc/vcl/sound.hxx
@@ -31,7 +31,6 @@
#include <vcl/dllapi.h>
#include <vcl/sndstyle.hxx>
-#include <tools/string.hxx>
#include <tools/link.hxx>
class Window;
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index fbd9239..a7e532b 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -45,7 +45,6 @@
#include "osl/file.hxx"
#include "osl/module.hxx"
-#include "tools/string.hxx"
#include "tools/debug.hxx"
#include "tools/stream.hxx"
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 9f13b03..d6410b8 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -31,7 +31,6 @@
#include "rtl/ustrbuf.hxx"
#include "tools/debug.hxx"
-#include "tools/string.hxx"
#include "vcl/window.hxx"
diff --git a/xmloff/inc/xmloff/xmlkywd.hxx b/xmloff/inc/xmloff/xmlkywd.hxx
index 53623cb..cd901c0 100644
--- a/xmloff/inc/xmloff/xmlkywd.hxx
+++ b/xmloff/inc/xmloff/xmlkywd.hxx
@@ -29,8 +29,6 @@
#ifndef _XMLOFF_XMLKYWD_HXX
#define _XMLOFF_XMLKYWD_HXX
-#include <tools/string.hxx>
-
/*
* THIS FILE IS DEPRECATED. IT IS SUPERSEDED BY XMLTOKEN.HXX.
*
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 09690cd..4c6969d 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -35,9 +35,6 @@
#include "SchXMLSeries2Context.hxx"
#include "SchXMLTools.hxx"
#include <tools/debug.hxx>
-#ifdef DBG_UTIL
-#include <tools/string.hxx>
-#endif
#include <comphelper/processfactory.hxx>
#include "xmloff/xmlnmspe.hxx"
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index b43716f..10c437b 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -37,7 +37,6 @@
#include <rtl/ustrbuf.hxx>
-#include <tools/string.hxx>
diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx
index 958072f..92e327a 100644
--- a/xmloff/source/draw/propimp0.cxx
+++ b/xmloff/source/draw/propimp0.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#include <tools/string.hxx>
#include <rtl/ustrbuf.hxx>
#include "propimp0.hxx"
#include <com/sun/star/drawing/LineDash.hpp>
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 8c643aa..ad6362f 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -27,7 +27,7 @@
************************************************************************/
-#include <tools/string.hxx>
+#include <osl/thread.h>
#include <xmloff/xmlscripti.hxx>
#include "sdxmlimp_impl.hxx"
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index 1ff5151..5c5afb9 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -33,7 +33,6 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlmetai.hxx>
#include <xmloff/nmspmap.hxx>
-#include <tools/string.hxx>
using namespace ::com::sun::star;
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index c21d4cc..f36bd05 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -41,7 +41,6 @@
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/XParser.hpp>
-#include <tools/string.hxx>
class SvStringsDtor;
using namespace ::com::sun::star::xml::sax;
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 5c63fcb..84b7a6b 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -27,12 +27,12 @@
************************************************************************/
#include <tools/debug.hxx>
+#include <osl/thread.h>
#include <com/sun/star/awt/FontFamily.hpp>
#include <com/sun/star/awt/FontPitch.hpp>
#include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/SizeType.hpp>
-#include <tools/string.hxx>
#include <xmloff/XMLFontStylesContext.hxx>
#include <xmloff/txtprmap.hxx>
#include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 66d8f00..fc95999 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -31,7 +31,6 @@
#include <rtl/ustrbuf.hxx>
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <svl/svarray.hxx>
#include <com/sun/star/text/XTextFrame.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index f9e7e15..aa53a60 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -52,7 +52,6 @@
#include <xmlsec/base64.h>
#include <xmlsec/strings.h>
-#include <tools/string.hxx>
#include <rtl/ustrbuf.hxx>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/servicefactory.hxx>
@@ -62,6 +61,7 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <vector>
#include "boost/scoped_array.hpp"
+#include <osl/thread.h>
#include "secerror.hxx"
diff --git a/xmlsecurity/tools/demo/util.cxx b/xmlsecurity/tools/demo/util.cxx
index 96e414e..60e4df9 100644
--- a/xmlsecurity/tools/demo/util.cxx
+++ b/xmlsecurity/tools/demo/util.cxx
@@ -35,7 +35,6 @@
#include <cppuhelper/bootstrap.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/streamhelper.hxx>
-#include <tools/string.hxx>
namespace cssu = com::sun::star::uno;
namespace cssl = com::sun::star::lang;
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
