diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-20 15:15:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-20 19:00:36 +0100 |
| commit | 45e366eadbba69140214a8e745a1d3ce3e4e8337 (patch) | |
| tree | cf01cfc9006789d7effb61ae140028829fc879c6 | |
| parent | 8bb4b18127cdc6259ecd65ec0f28d27d0513cb26 (diff) | |
drop unnecessary tools/string includes
Change-Id: I4278999b9b7d184c26036bbe9e3b98420f461e8c
196 files changed, 122 insertions, 261 deletions
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 59c0dde4d6d7..a1bc8d615cdd 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -559,7 +559,6 @@ #include <tools/resary.hxx> #include <tools/shl.hxx> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <tools/time.hxx> #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index 34653e130dca..034e67fb3909 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -29,8 +29,6 @@ #include <com/sun/star/plugin/PluginManager.hpp> #include <com/sun/star/plugin/XPluginManager.hpp> -#include <tools/string.hxx> - using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 71ec42f68e63..e2a881d0e9dc 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -22,7 +22,6 @@ // header for TYPEINFO #include <tools/rtti.hxx> -#include <tools/string.hxx> // header for ConfigItem #include <unotools/configitem.hxx> // header for SfxPoolItem diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index 01ffccf654de..59c07615ac70 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -23,7 +23,6 @@ #include <comphelper/stl_types.hxx> #include <rtl/ustring.hxx> #include <svl/poolitem.hxx> -#include <tools/string.hxx> //........................................................................ namespace offapp diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index d83f4b337a54..723df6653cfd 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/dbaccess/inc/pch/precompiled_dbu.hxx @@ -436,7 +436,6 @@ #include <tools/rcid.h> #include <tools/resmgr.hxx> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <tools/tenccvt.hxx> #include <tools/urlobj.hxx> #include <typelib/typedescription.hxx> diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 422a2fe9ecaa..32400c8f6b83 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -48,7 +48,6 @@ #include "ContainerMediator.hxx" #include "definitioncolumn.hxx" #include "objectnameapproval.hxx" -#include <tools/string.hxx> #include <tools/diagnose_ex.h> using namespace dbaccess; diff --git a/dbaccess/source/ext/macromigration/dbmm_types.hxx b/dbaccess/source/ext/macromigration/dbmm_types.hxx index 7ae52e987935..dec92b2b3814 100644 --- a/dbaccess/source/ext/macromigration/dbmm_types.hxx +++ b/dbaccess/source/ext/macromigration/dbmm_types.hxx @@ -20,7 +20,7 @@ #ifndef DBACCESS_DBMM_TYPES_HXX #define DBACCESS_DBMM_TYPES_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> namespace dbmm { diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index 6f45ad73d072..6f476ae4d022 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -23,7 +23,6 @@ #include "migrationlog.hxx" #include <comphelper/anytostring.hxx> -#include <tools/string.hxx> #include <rtl/ustrbuf.hxx> #include <vector> diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index 0395dc530240..f5fe334265e2 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -22,7 +22,6 @@ #include <comphelper/stl_types.hxx> #include "dbadllapi.hxx" -#include <tools/string.hxx> #include <connectivity/DriversConfig.hxx> namespace dbaccess diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index 39f4ffa5dc88..668bee93b7a0 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -33,7 +33,6 @@ #include <connectivity/sqlerror.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> -#include <tools/string.hxx> #include <boost/shared_ptr.hpp> diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx index 96ca135c4404..bbef65c330ba 100644 --- a/dbaccess/source/sdbtools/connection/tablename.cxx +++ b/dbaccess/source/sdbtools/connection/tablename.cxx @@ -28,7 +28,6 @@ #include <connectivity/dbtools.hxx> #include <tools/diagnose_ex.h> -#include <tools/string.hxx> namespace sdbtools { diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index a46169e9c926..2198d485aff6 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -63,7 +63,6 @@ #include <com/sun/star/container/XHierarchicalName.hpp> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -#include <tools/string.hxx> #include <svl/urihelper.hxx> #include <svl/filenotation.hxx> diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 195c52a3424f..b712ca61d612 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -65,7 +65,6 @@ #include <vcl/lstbox.hxx> #include <connectivity/dbtools.hxx> #include "sqlmessage.hxx" -#include <tools/string.hxx> #include "dbexchange.hxx" #include "UITools.hxx" #include <algorithm> diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx index 5505e0e1ee31..5ef9406feaae 100644 --- a/dbaccess/source/ui/inc/ConnectionLine.hxx +++ b/dbaccess/source/ui/inc/ConnectionLine.hxx @@ -20,7 +20,6 @@ #define DBAUI_CONNECTIONLINE_HXX #include <tools/gen.hxx> -#include <tools/string.hxx> #include "ConnectionLineData.hxx" #include <functional> diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 64e5279ab398..9684c4d6852e 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/Date.hpp> #include <vector> -#include <tools/string.hxx> #include <comphelper/stl_types.hxx> #include "TypeInfo.hxx" #include "WTypeSelect.hxx" diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index b3f02dfbd56d..af4b6232cd5f 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -20,7 +20,6 @@ #define DBAUI_GENERALUNDO_HXX #include <svl/undo.hxx> -#include <tools/string.hxx> #include "moduledbu.hxx" namespace dbaui diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index f49614b5b2ae..cea979f3428a 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -21,7 +21,6 @@ #include "queryview.hxx" #include <vcl/split.hxx> -#include <tools/string.hxx> #include "QEnumTypes.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include "querycontroller.hxx" diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index 5e8220b9d75f..877f659a3d36 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -23,7 +23,6 @@ #include "TableWindowData.hxx" #include <vector> #include <tools/rtti.hxx> -#include <tools/string.hxx> #include <boost/shared_ptr.hpp> namespace dbaui diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index 696113f0fe49..92744e76cbca 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -19,7 +19,6 @@ #ifndef DBAUI_TABLEDESIGNHELPBAR_HXX #define DBAUI_TABLEDESIGNHELPBAR_HXX -#include <tools/string.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> #include "IClipBoardTest.hxx" diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 94dd32ab6079..0ebc17b23247 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <vcl/lstbox.hxx> -#include <tools/string.hxx> #include "tabletree.hxx" diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx index a6c816dc8b7d..294ec5b2f9cf 100644 --- a/dbaccess/source/ui/inc/imageprovider.hxx +++ b/dbaccess/source/ui/inc/imageprovider.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdb/application/DatabaseObject.hpp> -#include <tools/string.hxx> #include <boost/shared_ptr.hpp> namespace dbaui diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx index 72afcd4237d2..4dde86de41a3 100644 --- a/dbaccess/source/ui/inc/indexes.hxx +++ b/dbaccess/source/ui/inc/indexes.hxx @@ -20,7 +20,6 @@ #ifndef _DBAUI_INDEXES_HXX_ #define _DBAUI_INDEXES_HXX_ -#include <tools/string.hxx> #include <comphelper/stl_types.hxx> namespace dbaui diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index f935ead58af6..fa94425987ed 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> -#include <tools/string.hxx> #include <comphelper/namedvaluecollection.hxx> class Window; diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index d79aa47b096c..6c6126ff044a 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -74,7 +74,6 @@ #include <svx/svxids.hrc> #include <svl/itempool.hxx> -#include <tools/string.hxx> #include "dbaccess_helpid.hrc" #include <svl/itemset.hxx> #include "sbagrid.hrc" diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx index 4250b6953ceb..164ef07a7640 100644 --- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx +++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx @@ -35,7 +35,6 @@ #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> -#include <tools/string.hxx> #include <cppuhelper/exc_hlp.hxx> #include <vector> diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index ca9a10e7b1c2..de9d549badef 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -25,7 +25,6 @@ #include "moduledbu.hxx" #include <svl/undo.hxx> -#include <tools/string.hxx> #include <osl/diagnose.h> #include <boost/scoped_ptr.hpp> diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 059c6f7532ee..c41a78d02433 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -24,7 +24,6 @@ #include "JoinExchange.hxx" #include "QEnumTypes.hxx" #include <com/sun/star/util/XNumberFormatter.hpp> -#include <tools/string.hxx> #include <svtools/transfer.hxx> namespace connectivity diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index c6c4959ef5c1..1aeca6712433 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -65,7 +65,6 @@ #include <cppuhelper/exc_hlp.hxx> #include <sfx2/sfxsids.hrc> #include <tools/diagnose_ex.h> -#include <tools/string.hxx> #include <vcl/msgbox.hxx> #include <boost/mem_fn.hpp> diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index aa122aeff0ee..de928de77517 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -22,7 +22,6 @@ #include "FieldDescriptions.hxx" #include <algorithm> #include <comphelper/types.hxx> -#include <tools/string.hxx> using namespace dbaui; using namespace ::com::sun::star::sdbc; diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 8311c5d494d9..ab4630236c59 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -24,7 +24,6 @@ #endif #include <comphelper/string.hxx> #include <sal/types.h> -#include <tools/string.hxx> #include <vcl/msgbox.hxx> #include <rtl/bootstrap.hxx> #include <app.hxx> diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 53a9ed249109..6072124df86b 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -27,7 +27,6 @@ #include "dispatchwatcher.hxx" #include <rtl/ustring.hxx> -#include <tools/string.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/synchronousdispatch.hxx> #include <com/sun/star/util/XCloseable.hpp> diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 3c15ca386f65..149591031c8c 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -26,7 +26,6 @@ #include "cppuhelper/exc_hlp.hxx" #include "tools/resid.hxx" #include "tools/solar.h" -#include "tools/string.hxx" #include "vcl/dialog.hxx" #include "vcl/msgbox.hxx" #include "vcl/svapp.hxx" diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h index ebd8331ecdcc..f5a62117b219 100644 --- a/desktop/source/deployment/inc/dp_resource.h +++ b/desktop/source/deployment/inc/dp_resource.h @@ -20,7 +20,6 @@ #ifndef INCLUDED_DP_RESOURCE_H #define INCLUDED_DP_RESOURCE_H -#include "tools/string.hxx" #include "tools/resid.hxx" #include <i18nlangtag/languagetag.hxx> #include "dp_misc.h" diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx index 9641cbfea1c9..204eec150eea 100644 --- a/desktop/source/deployment/misc/lockfile.cxx +++ b/desktop/source/deployment/misc/lockfile.cxx @@ -29,7 +29,6 @@ #include <osl/socket.hxx> #include <osl/security.hxx> #include <unotools/bootstrap.hxx> -#include <tools/string.hxx> #include <tools/config.hxx> #include "lockfile.hxx" diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index d359f185c665..c291ac7318e3 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -19,7 +19,6 @@ #include "wordbookmigration.hxx" #include <cppuhelper/supportsservice.hxx> -#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <unotools/bootstrap.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 35ae4ecbc03e..e268c0e23a14 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -22,7 +22,6 @@ #include "../../deployment/gui/dp_gui_shared.hxx" #include "unopkg_shared.h" #include "osl/thread.h" -#include "tools/string.hxx" #include "tools/resmgr.hxx" #include "cppuhelper/implbase3.hxx" #include "cppuhelper/exc_hlp.hxx" diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx index e316a1af5ed6..48752972d33b 100644 --- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx +++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx @@ -101,7 +101,6 @@ #include <tools/diagnose_ex.h> #include <tools/gen.hxx> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <uno/environment.h> #include <vcl/animate.hxx> #include <vcl/bitmapex.hxx> diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx index 3a380682e878..16f178518c3b 100644 --- a/drawinglayer/source/attribute/fontattribute.cxx +++ b/drawinglayer/source/attribute/fontattribute.cxx @@ -19,7 +19,7 @@ #include <drawinglayer/attribute/fontattribute.hxx> #include <rtl/instance.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx index d291179f5cac..63fb473dc9eb 100644 --- a/editeng/source/misc/swafopt.cxx +++ b/editeng/source/misc/swafopt.cxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/keycodes.hxx> -#include <tools/string.hxx> -#include <tools/gen.hxx> - #include <editeng/swafopt.hxx> +#include <tools/gen.hxx> +#include <vcl/keycodes.hxx> SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() : aBulletFont( OUString("StarSymbol"), diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx index 2f0aa392504e..3b99d4c7aabf 100644 --- a/extensions/source/dbpilots/dbptypes.hxx +++ b/extensions/source/dbpilots/dbptypes.hxx @@ -21,7 +21,6 @@ #define _EXTENSIONS_DBP_DBPTYPES_HXX_ #include <comphelper/stl_types.hxx> -#include <tools/string.hxx> //......................................................................... namespace dbp diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 2a61ab58a5bb..a0be0271591b 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -24,7 +24,6 @@ #include "gridwizard.hxx" #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <tools/string.hxx> #include <com/sun/star/form/XGridColumnFactory.hpp> #include <com/sun/star/awt/MouseWheelBehavior.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 0a442498c18e..1f9fd137ff02 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -47,7 +47,6 @@ #include <plugin/impl.hxx> #include <ucbhelper/content.hxx> #include <tools/urlobj.hxx> -#include <tools/string.hxx> #include <vcl/svapp.hxx> #include <salhelper/timer.hxx> #include <osl/file.hxx> diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx b/extensions/source/plugin/inc/plugin/plcom.hxx index fc1e2a9f5466..b685abcd9bdc 100644 --- a/extensions/source/plugin/inc/plugin/plcom.hxx +++ b/extensions/source/plugin/inc/plugin/plcom.hxx @@ -28,7 +28,6 @@ #ifndef __PLUGIN_INC_PLCOM_HXX #define __PLUGIN_INC_PLCOM_HXX -#include <tools/string.hxx> #include <list> class XPlugin_Impl; diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx index d7b0660c36ac..10193bc456ef 100644 --- a/extensions/source/propctrlr/formbrowsertools.cxx +++ b/extensions/source/propctrlr/formbrowsertools.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include "formresid.hrc" #include "modulepcr.hxx" -#include <tools/string.hxx> #include "formstrings.hxx" //............................................................................ diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index 597a06fb8b53..2bbf5b76ff3b 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -21,7 +21,6 @@ #define _EXTENSIONS_PROPCTRLR_PROPERTYINFO_HXX_ #include <sal/types.h> -#include <tools/string.hxx> #include <rtl/ustring.hxx> #include <rtl/string.hxx> #include <vector> diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index ccc356a2d63b..770937b2c18e 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -36,7 +36,6 @@ #include <connectivity/dbconversion.hxx> #include "formresid.hrc" #include <tools/debug.hxx> -#include <tools/string.hxx> #include <tools/StringListResource.hxx> #include <comphelper/types.hxx> #include "modulepcr.hxx" diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx index 3ecfa7660992..0cb8a7871284 100644 --- a/extensions/source/scanner/sane.hxx +++ b/extensions/source/scanner/sane.hxx @@ -21,7 +21,6 @@ #include <osl/thread.h> #include <osl/module.h> -#include <tools/string.hxx> #include <vcl/bitmap.hxx> #include <sane/sane.h> #include <scanner.hxx> diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx index edf738763e1b..fb6b66ba3fda 100644 --- a/extensions/workben/pythonautotest.cxx +++ b/extensions/workben/pythonautotest.cxx @@ -28,7 +28,6 @@ #include <vcl/svapp.hxx> #include <usr/ustring.hxx> #include <usr/weak.hxx> -#include <tools/string.hxx> #include <osl/conditn.hxx> using namespace usr; diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx index c1c6bdb4cf95..e6b972931b30 100644 --- a/extensions/workben/pythontest.cxx +++ b/extensions/workben/pythontest.cxx @@ -29,7 +29,6 @@ #include <vcl/svapp.hxx> #include <usr/ustring.hxx> #include <usr/weak.hxx> -#include <tools/string.hxx> #include <osl/conditn.hxx> using namespace usr; diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 5345b348fbcb..53bdc1fc5f7c 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -19,7 +19,6 @@ #include "Currency.hxx" #include <tools/debug.hxx> -#include <tools/string.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/svapp.hxx> #include <unotools/syslocale.hxx> diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 1c1df4626a5c..cfe14515fa8c 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -58,7 +58,6 @@ #include <rtl/ustrbuf.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> -#include <tools/string.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index cf9b27201de3..df1dd0114017 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/awt/ActionEvent.hpp> #include <com/sun/star/awt/XActionListener.hpp> -#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> #include <vcl/svapp.hxx> diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx index ac125380c433..b6641a0e6b4d 100644 --- a/forms/source/xforms/resourcehelper.cxx +++ b/forms/source/xforms/resourcehelper.cxx @@ -22,7 +22,6 @@ #include "frm_resource.hxx" #include <rtl/ustring.hxx> -#include <tools/string.hxx> namespace xforms diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm index 1b64ffc43253..f0a1df8fef78 100644 --- a/fpicker/source/aqua/resourceprovider.mm +++ b/fpicker/source/aqua/resourceprovider.mm @@ -23,7 +23,6 @@ #include <vcl/fpicker.hrc> #include <vcl/svapp.hxx> #include <tools/resmgr.hxx> -#include <tools/string.hxx> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx index d49bf454329b..f595c0b916bd 100644 --- a/fpicker/source/office/asyncfilepicker.hxx +++ b/fpicker/source/office/asyncfilepicker.hxx @@ -21,7 +21,6 @@ #define SVTOOLS_SOURCE_FILEPICKER_ASYNCFILEPICKER_HXX #include <tools/link.hxx> -#include <tools/string.hxx> #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Sequence.h> diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index a7809844b7f3..b024581c29e5 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -21,7 +21,6 @@ #include <PlacesListBox.hxx> -#include <tools/string.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/menubtn.hxx> diff --git a/fpicker/source/office/pickercallbacks.hxx b/fpicker/source/office/pickercallbacks.hxx index 32bef9252f9f..e8c19f5565f0 100644 --- a/fpicker/source/office/pickercallbacks.hxx +++ b/fpicker/source/office/pickercallbacks.hxx @@ -20,8 +20,8 @@ #ifndef SVTOOLS_PICKER_CALLBACKS_HXX #define SVTOOLS_PICKER_CALLBACKS_HXX -#include <tools/string.hxx> #include <sal/types.h> +#include <rtl/ustring.hxx> class Control; diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index 3e0a3b07d4e0..8796f37a2539 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -325,7 +325,6 @@ #include <tools/resmgr.hxx> #include <tools/solar.h> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <tools/wintypes.hxx> #include <tools/wldcrd.hxx> diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx index 3d0d38590999..a67b4932539e 100644 --- a/framework/inc/services/licensedlg.hxx +++ b/framework/inc/services/licensedlg.hxx @@ -23,7 +23,6 @@ #include <rtl/string.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#include <tools/string.hxx> #include <tools/resmgr.hxx> #include <vcl/button.hxx> #include <vcl/edit.hxx> diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index 7a5fbdace230..ce85a1563881 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -21,7 +21,6 @@ #define FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_ #include <framework/fwedllapi.h> -#include <tools/string.hxx> #include <tools/stream.hxx> #include <tools/color.hxx> diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index 339fb87df716..2bf7912f278c 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -20,7 +20,6 @@ #include <services/mediatypedetectionhelper.hxx> #include <services.h> #include <svl/inettype.hxx> -#include <tools/string.hxx> namespace framework { diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index f68f481dce3d..42cd3890e58a 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -36,7 +36,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/idl/inc/bastype.hxx b/idl/inc/bastype.hxx index f97672372dc4..f03f3f6d4c8d 100644 --- a/idl/inc/bastype.hxx +++ b/idl/inc/bastype.hxx @@ -24,7 +24,6 @@ #include <sal/types.h> #include <tools/globname.hxx> #include <tools/stream.hxx> -#include <tools/string.hxx> class SvStringHashEntry; class SvIdlDataBase; diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx index c82211dc7906..3ee2bcb9cd74 100644 --- a/idl/inc/command.hxx +++ b/idl/inc/command.hxx @@ -20,7 +20,6 @@ #ifndef _COMMAND_HXX #define _COMMAND_HXX -#include <tools/string.hxx> #include <rtl/ustring.hxx> #include <vector> diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx index 115d09e82df0..ee3ba12d48cf 100644 --- a/idl/inc/hash.hxx +++ b/idl/inc/hash.hxx @@ -20,8 +20,9 @@ #ifndef _HASH_HXX #define _HASH_HXX +#include <rtl/ustring.hxx> #include <tools/ref.hxx> -#include <tools/string.hxx> +#include <tools/solar.h> #include <vector> class SvHashTable diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx index b9dc81e70190..39714151d9c6 100644 --- a/idl/source/prj/svidl.cxx +++ b/idl/source/prj/svidl.cxx @@ -23,7 +23,7 @@ #include <database.hxx> #include <globals.hxx> #include <command.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <osl/file.hxx> #define BR 0x8000 diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index b5370e7654b1..e6406d213277 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -26,7 +26,6 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/implbase2.hxx> -#include <tools/string.hxx> #include <simpleguesser.hxx> #include <guess.hxx> diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx index f4e7d08d2959..f5f1d76356c8 100644 --- a/lingucomponent/source/lingutil/lingutil.hxx +++ b/lingucomponent/source/lingutil/lingutil.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/Locale.hpp> #include <rtl/string.hxx> #include <rtl/ustring.hxx> -#include <tools/string.hxx> #include <vector> #include <list> diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index fb00d9db2eac..5ef6f8d340bc 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -23,7 +23,6 @@ #include <osl/mutex.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> #include <comphelper/processfactory.hxx> diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index 3261ffd8389a..c00656f339ad 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase4.hxx> #include <cppuhelper/interfacecontainer.h> -#include <tools/string.hxx> #include <boost/unordered_map.hpp> #include <set> diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 4bd17fce3c9a..c454824215e9 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -18,7 +18,6 @@ */ #include <tools/debug.hxx> -#include <tools/string.hxx> #include <i18nlangtag/languagetag.hxx> #include <tools/stream.hxx> #include <osl/mutex.hxx> diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index f14792c805bb..82d4e7e2f66a 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -26,7 +26,6 @@ #include <osl/mutex.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index c8ea57877feb..a488c4a47259 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/implbase2.hxx> // helper for implementations #include <cppuhelper/implbase1.hxx> // helper for implementations #include <cppuhelper/interfacecontainer.h> -#include <tools/string.hxx> #include <tools/stream.hxx> #include "defs.hxx" diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 2267e20d6c3b..f90a6b0503b8 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -22,6 +22,7 @@ #include <i18nlangtag/mslangid.hxx> #include <osl/file.hxx> #include <tools/stream.hxx> +#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <unotools/pathoptions.hxx> #include <unotools/useroptions.hxx> diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index 090f0e96493a..03a37317aaeb 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -20,7 +20,6 @@ #include <unicode/uscript.h> #include <i18nlangtag/lang.h> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <osl/mutex.hxx> #include <ucbhelper/content.hxx> diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index 1ffda0911a39..8b72e603dc59 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.h> -#include <tools/string.hxx> #include "linguistic/misc.hxx" #include "defs.hxx" diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index fe24438a0b6c..1a7f61763db9 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -18,7 +18,6 @@ */ #include <sal/macros.h> -#include <tools/string.hxx> #include <tools/debug.hxx> #include <unotools/pathoptions.hxx> #include <svl/lngmisc.hxx> diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index 726493ebb3b9..abb8e3b393b7 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> #include <tools/debug.hxx> diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index 5ee4dd5fc741..0fda8baa7279 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -20,7 +20,6 @@ #include "cppuhelper/exc_hlp.hxx" #include "rtl/ustrbuf.hxx" #include "sal/log.hxx" -#include "tools/string.hxx" #include <algorithm> #include <assert.h> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -387,7 +386,6 @@ #include <tools/multisel.hxx> #include <tools/solar.h> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <tools/time.hxx> #include <unotools/fontcvt.hxx> #include <unotools/fontdefs.hxx> diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index af1d6e02ef31..7a75d885cec8 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -57,7 +57,6 @@ #include <com/sun/star/text/XTextField.hpp> #include <com/sun/star/text/XTextRange.hpp> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <unotools/fontdefs.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/graph.hxx> diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 968d07953acd..429472be9ddb 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -60,7 +60,6 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/frame/XModel.hpp> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <vcl/cvtgrf.hxx> #include <unotools/fontcvt.hxx> #include <vcl/graph.hxx> diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 709729062382..43d7fc6e2a9b 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -54,7 +54,6 @@ #include "oox/helper/graphichelper.hxx" #include "oox/helper/propertymap.hxx" #include "oox/ole/axbinarywriter.hxx" -#include "tools/string.hxx" namespace oox { namespace ole { diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx index cfaca587cbad..ea0babe61cf9 100644 --- a/padmin/source/helper.hxx +++ b/padmin/source/helper.hxx @@ -21,7 +21,7 @@ #define _PAD_HELPER_HXX_ #include <list> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/resid.hxx> #include <vcl/dialog.hxx> #include <vcl/button.hxx> diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx index ec6e5c1d4f95..160749c1d2dd 100644 --- a/padmin/source/progress.cxx +++ b/padmin/source/progress.cxx @@ -19,7 +19,7 @@ #include <ctype.h> #include <stdio.h> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/stream.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index ad7f4ce15ecd..1bcb131e3975 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -42,7 +42,6 @@ #include <svl/lstner.hxx> #include <svx/svdouno.hxx> #include <svx/svdundo.hxx> -#include <tools/string.hxx> #include <functional> #include <memory> diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 709a1c9459af..b2f90da302cb 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -41,7 +41,6 @@ #include <com/sun/star/task/XJob.hpp> #include <tools/debug.hxx> -#include <tools/string.hxx> #include <unotools/useroptions.hxx> #include <unotools/tempfile.hxx> #include <unotools/sharedunocomponent.hxx> diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index f990d9778603..50f8222a3939 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/inspection/XPropertyHandler.hpp> -#include <tools/string.hxx> //............................................................................ namespace rptui diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 754c6c619d54..c53a077f4da1 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -73,7 +73,6 @@ #include <connectivity/dbtools.hxx> #include <boost/bind.hpp> -#include <tools/string.hxx> #include "metadata.hxx" #include <svl/itempool.hxx> #include <svl/itemset.hxx> diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 3431008bbc1f..781395b6239d 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -27,7 +27,6 @@ #include "reportformula.hxx" #include <tools/diagnose_ex.h> -#include <tools/string.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index dbeceb9e5f2a..be3ab4919291 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -36,7 +36,6 @@ #include "DateTime.hxx" #include <sfx2/filedlghelper.hxx> -#include <tools/string.hxx> #include <tools/diagnose_ex.h> #include "rptui_slotid.hrc" #include "reportformula.hxx" 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 diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 980866d2ed9b..cb5162b5988c 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -20,7 +20,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> -#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <editeng/editobj.hxx> #include <editeng/editstat.hxx> diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 99fa566620a7..bece096acd3d 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -23,6 +23,7 @@ #include <math.h> #include <rtl/math.hxx> #include <rtl/ustring.hxx> +#include <tools/string.hxx> #include "formula/errorcodes.hxx" #include "formula/tokenarray.hxx" #include "scdll.hxx" diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 1655b2da8bd8..7dc049b0ef50 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -44,7 +44,7 @@ ScNumFormatAbbrev::ScNumFormatAbbrev(sal_uLong nFormat, PutFormatIndex(nFormat, rFormatter); } -void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet ) +void ScNumFormatAbbrev::Load( SvStream& rStream, rtl_TextEncoding eByteStrSet ) { sal_uInt16 nSysLang, nLang; sFormatstring = rStream.ReadUniOrByteString( eByteStrSet ); @@ -55,7 +55,7 @@ void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet ) eSysLnge = Application::GetSettings().GetLanguageTag().getLanguageType(); } -void ScNumFormatAbbrev::Save( SvStream& rStream, CharSet eByteStrSet ) const +void ScNumFormatAbbrev::Save( SvStream& rStream, rtl_TextEncoding eByteStrSet ) const { rStream.WriteUniOrByteString( sFormatstring, eByteStrSet ); rStream << (sal_uInt16) eSysLnge << (sal_uInt16) eLnge; diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index fce42c27fc05..de90f1d1926c 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -34,7 +34,7 @@ #include "rtl/strbuf.hxx" FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc, - const ScAddress& rOutPos, const CharSet eNach, sal_uInt32 nDifOption ) + const ScAddress& rOutPos, const rtl_TextEncoding eNach, sal_uInt32 nDifOption ) { SCCOL nEndCol; SCROW nEndRow; @@ -49,13 +49,13 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* p FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, - const ScRange&rRange, const CharSet eCharSet, sal_uInt32 nDifOption ) + const ScRange&rRange, const rtl_TextEncoding eCharSet, sal_uInt32 nDifOption ) { OSL_ENSURE( rRange.aStart <= rRange.aEnd, "*ScExportDif(): Range not sorted!" ); OSL_ENSURE( rRange.aStart.Tab() == rRange.aEnd.Tab(), "ScExportDif(): only one table please!" ); - const CharSet eStreamCharSet = rOut.GetStreamCharSet(); + const rtl_TextEncoding eStreamCharSet = rOut.GetStreamCharSet(); if ( eStreamCharSet != eCharSet ) rOut.SetStreamCharSet( eCharSet ); diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index fd9447d3d84b..53c1a6c8585a 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -21,7 +21,7 @@ #include <math.h> #include <svl/zforlist.hxx> - +#include <tools/string.hxx> #include "attrib.hxx" #include "dif.hxx" #include "docpool.hxx" @@ -49,7 +49,7 @@ const sal_Unicode pKey1_0[] = { '1', ',', '0', 0 }; FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, const ScAddress& rInsPos, - const CharSet eVon, sal_uInt32 nDifOption ) + const rtl_TextEncoding eVon, sal_uInt32 nDifOption ) { DifParser aDifParser( rIn, nDifOption, *pDoc, eVon ); @@ -234,7 +234,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, } -DifParser::DifParser( SvStream& rNewIn, const sal_uInt32 nOption, ScDocument& rDoc, CharSet e ) : +DifParser::DifParser( SvStream& rNewIn, const sal_uInt32 nOption, ScDocument& rDoc, rtl_TextEncoding e ) : rIn( rNewIn ) { eCharSet = e; diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index c17cdfe43090..d4cb870ebf42 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -20,7 +20,7 @@ #include <comphelper/docpasswordhelper.hxx> #include <comphelper/sequenceashashmap.hxx> - +#include <osl/thread.h> #include "xistream.hxx" #include "xlstring.hxx" #include "xiroot.hxx" diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index 8ff00864252e..51daa73f6296 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -61,12 +61,12 @@ class ScPatternAttr; class DifParser { public: - OUString aData; + OUString aData; double fVal; - sal_uInt32 nVector; - sal_uInt32 nVal; - sal_uInt32 nNumFormat; - CharSet eCharSet; + sal_uInt32 nVector; + sal_uInt32 nVal; + sal_uInt32 nNumFormat; + rtl_TextEncoding eCharSet; private: SvNumberFormatter* pNumFormatter; SvStream& rIn; @@ -80,7 +80,7 @@ private: static inline sal_Bool IsEOD( const sal_Unicode* pRef ); static inline sal_Bool Is1_0( const sal_Unicode* pRef ); public: - DifParser( SvStream&, const sal_uInt32 nOption, ScDocument&, CharSet ); + DifParser( SvStream&, const sal_uInt32 nOption, ScDocument&, rtl_TextEncoding ); TOPIC GetNextTopic( void ); diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index 7ef1583b19a5..ab7b209bd9a0 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -20,7 +20,6 @@ #ifndef SC_EEPARSER_HXX #define SC_EEPARSER_HXX -#include <tools/string.hxx> #include <tools/gen.hxx> #include <vcl/graph.hxx> #include <svl/itemset.hxx> diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx index 49a6e4240deb..8ec46e33a3f5 100644 --- a/sc/source/filter/inc/excscen.hxx +++ b/sc/source/filter/inc/excscen.hxx @@ -21,9 +21,8 @@ #define SC_EXCSCEN_HXX #include <boost/ptr_container/ptr_vector.hpp> - +#include <rtl/ustring.hxx> #include <tools/solar.h> -#include <tools/string.hxx> struct RootData; class XclImpRoot; diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index 39b6f0ee0e65..1a6ce47f869b 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -38,9 +38,9 @@ protected: SvStream& aOut; // Ausgabe-Stream ScDocument* pD; // Dokument - CharSet eZielChar; // Ziel-Zeichensatz + rtl_TextEncoding eZielChar; // Ziel-Zeichensatz public: - ExportTyp( SvStream& aStream, ScDocument* pDoc, CharSet eDest ): + ExportTyp( SvStream& aStream, ScDocument* pDoc, rtl_TextEncoding eDest ): aOut( aStream ) { eZielChar = eDest; diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 23b205cfd8ad..b8d5cc783b3e 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -24,7 +24,6 @@ #include <map> #include <limits> #include <memory> -#include <tools/string.hxx> #include <sal/macros.h> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> @@ -280,7 +279,7 @@ public: ScFormatFilterPluginImpl(); virtual ~ScFormatFilterPluginImpl(); // various import filters - virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, CharSet eSrc = RTL_TEXTENCODING_DONTKNOW ); + virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW ); virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ); virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ); // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet @@ -289,7 +288,7 @@ public: // eFormat == EIF_BIFF_LE4 -> nur Nicht-Storage-Dateien _koennen_ zum Erfolg fuehren virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ); virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, - const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ); + const rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ); virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ); virtual FltError ScImportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, bool bCalcWidthHeight = true, @@ -300,14 +299,14 @@ public: virtual OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ); // various export filters - virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, CharSet eDest ); - virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const CharSet eDest, + virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ); + virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const rtl_TextEncoding eDest, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ); - 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 ); - 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 ); - virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest ); + virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ); virtual ScOrcusFilters* GetOrcusFilters(); }; diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index a5430cfa5070..21fb9560f82c 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -21,7 +21,6 @@ #define SC_LOTFNTBF_HXX #include <tools/solar.h> -#include <tools/string.hxx> #include "scitems.hxx" #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx index 492a463e8994..8cb446d50ad1 100644 --- a/sc/source/filter/inc/root.hxx +++ b/sc/source/filter/inc/root.hxx @@ -92,7 +92,7 @@ struct LOTUS_ROOT ScDocument* pDoc; LotusRangeList* pRangeNames; ScRangeName* pScRangeName; - CharSet eCharsetQ; + rtl_TextEncoding eCharsetQ; Lotus123Typ eFirstType; Lotus123Typ eActType; ScRange aActRange; @@ -100,7 +100,7 @@ struct LOTUS_ROOT LotusFontBuffer* pFontBuff; LotAttrTable* pAttrTable; - LOTUS_ROOT( ScDocument* pDocP, CharSet eQ ); + LOTUS_ROOT( ScDocument* pDocP, rtl_TextEncoding eQ ); ~LOTUS_ROOT(); }; diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index d6950eed8a44..77061c8743dc 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -22,7 +22,6 @@ #include <map> #include <tools/mempool.hxx> -#include <tools/string.hxx> #include <svl/zforlist.hxx> #include <svl/nfkeytab.hxx> #include <editeng/svxfont.hxx> diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index bb024e066293..e0efa750029d 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.cxx @@ -45,7 +45,7 @@ //------------------------------------------------------------------ FltError ScFormatFilterPluginImpl::ScExportRTF( SvStream& rStrm, ScDocument* pDoc, - const ScRange& rRange, const CharSet /*eNach*/ ) + const ScRange& rRange, const rtl_TextEncoding /*eNach*/ ) { ScRTFExport aEx( rStrm, pDoc, rRange ); return aEx.Write(); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 85868ecf8708..d2c1d1e5b4a9 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2083,7 +2083,7 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) bool ScImportExport::Doc2HTML( SvStream& rStrm, const OUString& rBaseURL ) { - // CharSet is ignored in ScExportHTML, read from Load/Save HTML options + // rtl_TextEncoding is ignored in ScExportHTML, read from Load/Save HTML options ScFormatFilter::Get().ScExportHTML( rStrm, rBaseURL, pDoc, aRange, RTL_TEXTENCODING_DONTKNOW, bAll, aStreamPath, aNonConvertibleChars ); return rStrm.GetError() == SVSTREAM_OK; @@ -2091,7 +2091,7 @@ bool ScImportExport::Doc2HTML( SvStream& rStrm, const OUString& rBaseURL ) bool ScImportExport::Doc2RTF( SvStream& rStrm ) { - // CharSet is ignored in ScExportRTF + // rtl_TextEncoding is ignored in ScExportRTF ScFormatFilter::Get().ScExportRTF( rStrm, pDoc, aRange, RTL_TEXTENCODING_DONTKNOW ); return rStrm.GetError() == SVSTREAM_OK; } @@ -2207,7 +2207,7 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin { OSL_FAIL("Missing file filters"); } virtual ~ScFormatFilterMissing() {} - virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, CharSet ) RETURN_ERROR + virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding ) RETURN_ERROR virtual FltError ScImportQuattroPro( SfxMedium &, ScDocument * ) RETURN_ERROR virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) RETURN_ERROR virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) RETURN_ERROR @@ -2220,12 +2220,12 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin { virtual ScEEAbsImport *CreateHTMLImport( ScDocument*, const OUString&, const ScRange&, bool ) { return NULL; } virtual OUString GetHTMLRangeNameList( ScDocument*, const OUString& ) { return OUString(); } - virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel, CharSet ) RETURN_ERROR + virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel, rtl_TextEncoding ) RETURN_ERROR virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress&, const CharSet, sal_uInt32 ) RETURN_ERROR virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange&, const CharSet, sal_uInt32 ) RETURN_ERROR virtual FltError ScExportHTML( SvStream&, const OUString&, ScDocument*, const ScRange&, const CharSet, bool, const OUString&, OUString& ) RETURN_ERROR - virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange&, const CharSet ) RETURN_ERROR + virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange&, const rtl_TextEncoding ) RETURN_ERROR virtual ScOrcusFilters* GetOrcusFilters() { return NULL; } }; diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 822aec9236bf..ece01e9ed744 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/accessibility/XAccessibleTable.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <tools/gen.hxx> -#include <tools/string.hxx> #include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx index 3a40ae5c0734..9f1200eadf7e 100644 --- a/sc/source/ui/inc/asciiopt.hxx +++ b/sc/source/ui/inc/asciiopt.hxx @@ -22,7 +22,6 @@ #ifndef SC_ASCIIOPT_HXX #define SC_ASCIIOPT_HXX -#include <tools/string.hxx> #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index d4498662867c..d6db458abdfb 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -21,9 +21,7 @@ #define SC_AUTOSTYL_HXX #include <boost/ptr_container/ptr_vector.hpp> - -#include <tools/string.hxx> - +#include <rtl/ustring.hxx> #include <vcl/timer.hxx> class ScDocShell; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index b25f8497b5cf..8755da85bc0d 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -20,7 +20,6 @@ #ifndef SC_GRIDWIN_HXX #define SC_GRIDWIN_HXX -#include <tools/string.hxx> #include <svtools/transfer.hxx> #include "viewutil.hxx" #include "viewdata.hxx" diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx index 705a24542221..d9ccdebd06aa 100644 --- a/sc/source/ui/inc/lnktrans.hxx +++ b/sc/source/ui/inc/lnktrans.hxx @@ -21,7 +21,7 @@ #define SC_LNKTRANS_HXX #include <svtools/transfer.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class ScLinkTransferObj : public TransferableHelper { diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index 2f36768e4aff..c4d485d81ff1 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include "pageuno.hxx" #include "shapeuno.hxx" diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index b31a0abe28e5..078c9e98fd1a 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -70,8 +70,6 @@ #include <com/sun/star/script/ModuleInfo.hpp> #include <com/sun/star/script/ModuleType.hpp> -#include <tools/string.hxx> - //zhangyun showdataform #include <sfx2/sfxdlg.hxx> #include "scabstdlg.hxx" diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 4a3545c2b286..5d19147f9f64 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -38,7 +38,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <ooo/vba/excel/XApplication.hpp> -#include <tools/string.hxx> #include "tabvwsh.hxx" #include "vbaglobals.hxx" diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx index 06cb8f917c10..835ae47c1c32 100644 --- a/sc/workben/result.hxx +++ b/sc/workben/result.hxx @@ -21,7 +21,7 @@ #define SC_RESULT_HXX #include <vcl/timer.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <boost/ptr_container/ptr_vector.hpp> diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx index 19112e33cf0d..9e7221e911c6 100644 --- a/sd/source/ui/inc/MasterPageObserver.hxx +++ b/sd/source/ui/inc/MasterPageObserver.hxx @@ -20,8 +20,8 @@ #ifndef SD_VIEW_MASTER_PAGE_OBSERVER_HXX #define SD_VIEW_MASTER_PAGE_OBSERVER_HXX +#include <rtl/ustring.hxx> #include "tools/SdGlobalResourceContainer.hxx" -#include <tools/string.hxx> #include <osl/mutex.hxx> #include <memory> #include <set> diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm index ebeda0489d50..bcc04494338f 100644 --- a/sfx2/source/appl/shutdowniconaqua.mm +++ b/sfx2/source/appl/shutdowniconaqua.mm @@ -21,7 +21,7 @@ #include "unotools/moduleoptions.hxx" #include "unotools/dynamicmenuoptions.hxx" #include "unotools/historyoptions.hxx" -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include "tools/urlobj.hxx" #include "osl/file.h" #include "comphelper/sequenceashashmap.hxx" diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 77c85a9673f2..beeb3d8be47f 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -22,9 +22,9 @@ #include "ddeimp.hxx" #include <algorithm> #include <comphelper/string.hxx> +#include <rtl/ustring.hxx> #include <svl/svdde.hxx> #include <tools/debug.hxx> -#include <tools/string.hxx> #include <osl/thread.h> #include <o3tl/sorted_vector.hxx> diff --git a/sw/inc/IDocumentListItems.hxx b/sw/inc/IDocumentListItems.hxx index f4e766aeff53..c6ced05615d7 100644 --- a/sw/inc/IDocumentListItems.hxx +++ b/sw/inc/IDocumentListItems.hxx @@ -21,7 +21,7 @@ #define IDOCUMENTLISTITEMS_HXX_INCLUDED #include <vector> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwNodeNum; /** Provides numbered items of a document. diff --git a/sw/inc/IDocumentListsAccess.hxx b/sw/inc/IDocumentListsAccess.hxx index 1c072f73d524..4351d6fe28b1 100644 --- a/sw/inc/IDocumentListsAccess.hxx +++ b/sw/inc/IDocumentListsAccess.hxx @@ -20,7 +20,7 @@ #ifndef IDOCUMENTLISTSACCESS_HXX_INCLUDED #define IDOCUMENTLISTSACCESS_HXX_INCLUDED -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwList; diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx index 80a0fde55135..0fc0156f2a66 100644 --- a/sw/inc/IDocumentOutlineNodes.hxx +++ b/sw/inc/IDocumentOutlineNodes.hxx @@ -20,8 +20,8 @@ #ifndef IDOCUMENTOUTLINENODES_HXX_INCLUDED #define IDOCUMENTOUTLINENODES_HXX_INCLUDED +#include <rtl/ustring.hxx> #include <sal/types.h> -#include <tools/string.hxx> #include <vector> class SwTxtNode; diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx index 9b6adc3a7377..47795c46340e 100644 --- a/sw/inc/acmplwrd.hxx +++ b/sw/inc/acmplwrd.hxx @@ -24,7 +24,7 @@ #include <editeng/swafopt.hxx> #include <editeng/Trie.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwDoc; class SwAutoCompleteWord_Impl; diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index fa3d0fffbe1c..d75420345b16 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -21,12 +21,8 @@ #define SW_CALC_HXX #include <vector> - -#include <tools/string.hxx> -#include <unotools/syslocale.hxx> - #include <basic/sbxvar.hxx> - +#include <unotools/syslocale.hxx> #include "swdllapi.h" class CharClass; diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 6935b842db2c..e3f64d88a4fb 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -19,21 +19,17 @@ #ifndef _CCOLL_HXX #define _CCOLL_HXX +#include <rtl/string.hxx> +#include <rtl/ustring.hxx> #include <svl/poolitem.hxx> -#include <tools/string.hxx> #include <sfx2/tabdlg.hxx> - +#include <svtools/svtabbx.hxx> #include <vcl/fixed.hxx> - #include <vcl/button.hxx> -#include <svtools/svtabbx.hxx> - #include <vcl/lstbox.hxx> #include "swdllapi.h" #include "cmdid.h" -#include <rtl/string.hxx> - //*********************************************************** struct CollName { diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index e9843292c2d8..8994c37bdf06 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/i18n/WordType.hpp> #include <rtl/ustring.hxx> -#include <tools/string.hxx> #include <tools/link.hxx> #include <tools/rtti.hxx> diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx index 118dba8b6fce..8ad766fe43e9 100644 --- a/sw/inc/dbgoutsw.hxx +++ b/sw/inc/dbgoutsw.hxx @@ -22,9 +22,9 @@ #ifdef DBG_UTIL #include <boost/unordered_map.hpp> +#include <rtl/ustring.hxx> #include <tox.hxx> #include <cstdio> -#include "tools/string.hxx" class SwNode; class SwTxtAttr; diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index d5b20702d3a6..9ab0b91b36cf 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -19,8 +19,7 @@ #ifndef _SWDBMGR_HXX #define _SWDBMGR_HXX - -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/link.hxx> #include <com/sun/star/util/Date.hpp> #include "swdllapi.h" diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 333d6db26af5..1891f3ad126d 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -31,7 +31,6 @@ #include <svl/lstner.hxx> #include <svtools/embedhlp.hxx> -#include <tools/string.hxx> class SwDoc; class SfxDocumentInfoDialog; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 013fcdc2824d..d3a1aa5a3516 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -21,7 +21,6 @@ #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> -#include <tools/string.hxx> #include <vcl/font.hxx> #include <editeng/swafopt.hxx> #include "swdllapi.h" diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 8b89070aa40d..590f53449c54 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -23,7 +23,7 @@ #include <frmatr.hxx> #include <swtypes.hxx> // For MAXLEVEL. #include <boost/ptr_container/ptr_vector.hpp> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwDoc; // For friend. diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index f1b8975028e7..b8ea3333b60d 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -19,8 +19,7 @@ #ifndef _FMTRFMRK_HXX #define _FMTRFMRK_HXX - -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <svl/poolitem.hxx> class SwTxtRefMark; diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index f322e75769b4..bfe0c2585840 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/text/PositionLayoutDir.hpp> #include <cppuhelper/weakref.hxx> #include <tools/gen.hxx> -#include <tools/string.hxx> #include <format.hxx> #include "swdllapi.h" diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx index a5f1e840ddea..aaad290ff3f4 100644 --- a/sw/inc/ftninfo.hxx +++ b/sw/inc/ftninfo.hxx @@ -19,7 +19,7 @@ #ifndef _FTNINFO_HXX #define _FTNINFO_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include "swdllapi.h" #include <calbck.hxx> #include <editeng/numitem.hxx> diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index e664538a285a..6934c26142e0 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -23,6 +23,7 @@ #include "rtl/instance.hxx" #include <tools/solar.h> +#include <tools/string.hxx> #include <tools/rtti.hxx> // for RTTI of SwIndexReg #include <swdllapi.h> diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index e347c190c8b0..ef9933d33fdd 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -20,11 +20,11 @@ #ifndef _IODETECT_HXX_ #define _IODETECT_HXX_ +#include <osl/endian.h> +#include <rtl/ustring.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> -#include <osl/endian.h> -#include <tools/string.hxx> #include <swddllapi.h> #define FILTER_RTF "RTF" ///< RTF filter diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx index 5b0a703e7828..1d85296d28a7 100644 --- a/sw/inc/list.hxx +++ b/sw/inc/list.hxx @@ -20,7 +20,7 @@ #ifndef LIST_HXX_INCLUDED #define LIST_HXX_INCLUDED -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwNumRule; class SwNodes; diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index b6b5543d21eb..56093c22bd70 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -27,7 +27,6 @@ #include <format.hxx> #include <swtypes.hxx> #include <editeng/adjustitem.hxx> -#include <tools/string.hxx> class SwCharFmt; class IntlWrapper; diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 053b441ada8a..2ffc449f0fef 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -28,7 +28,6 @@ #include "salhelper/simplereferenceobject.hxx" #include "svl/urihelper.hxx" #include "svtools/treelistentry.hxx" -#include "tools/string.hxx" #include "vcl/metric.hxx" #include "vcl/svapp.hxx" #include <algorithm> diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index df7a92b18562..6a2750b93ffc 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -20,7 +20,7 @@ #define _REDLINE_HXX #include <tools/datetime.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <pam.hxx> diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx index 3f1bcf6c4e1c..85d5d95b7971 100644 --- a/sw/inc/shellres.hxx +++ b/sw/inc/shellres.hxx @@ -20,7 +20,7 @@ #define _SHELLRES_HXX #include <swdllapi.h> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/rc.hxx> #include <vcl/bitmap.hxx> diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx index 87029f4203a8..f8a3bf1b1fec 100644 --- a/sw/inc/sortopt.hxx +++ b/sw/inc/sortopt.hxx @@ -19,7 +19,7 @@ #ifndef _SORTOPT_HXX #define _SORTOPT_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include "swdllapi.h" #include <vector> diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 2e039534e033..f5ed3bf60cf3 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -21,7 +21,6 @@ #include <rtl/ustring.hxx> #include <tools/solar.h> -#include <tools/string.hxx> #include <sfx2/sfxdlg.hxx> #include <svx/svxdlg.hxx> #include <vcl/syswin.hxx> diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx index f624ad79eaca..d98d0ff3a71e 100644 --- a/sw/inc/swcalwrp.hxx +++ b/sw/inc/swcalwrp.hxx @@ -21,7 +21,7 @@ #define _SWCALWRP_HXX #include <i18nlangtag/lang.h> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <unotools/calendarwrapper.hxx> #include <salhelper/singletonref.hxx> diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index 55aab0fd6673..33ce24e5c9fc 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -20,7 +20,7 @@ #define _TXTFLD_HXX #include <txatbase.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwTxtNode; diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 656d1c451147..16baeacc6def 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -48,7 +48,6 @@ #include <cppuhelper/implbase10.hxx> // helper for implementations #include <cppuhelper/weakref.hxx> -#include <tools/string.hxx> #include <tools/link.hxx> #include <vcl/timer.hxx> diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx index 9b683bb3f29b..63d3f72e9f0e 100644 --- a/sw/inc/unosrch.hxx +++ b/sw/inc/unosrch.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <cppuhelper/implbase3.hxx> // helper for implementations -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SfxItemPropertySet; class SwXTextDocument; diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 342759d059b2..19f1db863bee 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -40,7 +40,6 @@ #include <cppuhelper/interfacecontainer.h> #include <comphelper/uno3.hxx> -#include <tools/string.hxx> #include <calbck.hxx> #include <TextCursorHelper.hxx> diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 3a91d57f0e19..93683e282c5a 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -23,7 +23,6 @@ #include <config_features.h> #include <tools/gen.hxx> -#include <tools/string.hxx> #include <tools/color.hxx> #include <sfx2/zoomitem.hxx> diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx index 880998a199ff..7a3e68f13a3f 100644 --- a/sw/source/core/bastyp/index.cxx +++ b/sw/source/core/bastyp/index.cxx @@ -21,8 +21,8 @@ #include <assert.h> #include <stdlib.h> +#include <rtl/ustring.hxx> #include <tools/solar.h> -#include <tools/string.hxx> TYPEINIT0(SwIndexReg); diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx index 0e6b2acf2ac4..42c9d1304866 100644 --- a/sw/source/core/bastyp/swtypes.cxx +++ b/sw/source/core/bastyp/swtypes.cxx @@ -18,7 +18,7 @@ */ #include "swtypes.hxx" -#include "tools/string.hxx" +#include <rtl/ustring.hxx> #include <bodyfrm.hxx> #include <cellfrm.hxx> diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index 75c5c7187e24..233326a1a54a 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -19,7 +19,7 @@ #ifdef DBG_UTIL -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <svl/poolitem.hxx> #include <svl/itemiter.hxx> #include <string> diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx index 46dee451bae1..72c82bcfebbe 100644 --- a/sw/source/core/inc/UndoAttribute.hxx +++ b/sw/source/core/inc/UndoAttribute.hxx @@ -22,8 +22,8 @@ #include <undobj.hxx> #include <memory> +#include <rtl/ustring.hxx> #include <svl/itemset.hxx> -#include <tools/string.hxx> #include <swtypes.hxx> #include <calbck.hxx> #include <set> diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx index fd9c201c26ed..e71e9d028fad 100644 --- a/sw/source/core/inc/UndoCore.hxx +++ b/sw/source/core/inc/UndoCore.hxx @@ -22,7 +22,7 @@ #include <undobj.hxx> #include <calbck.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SfxItemSet; class SwFmtColl; diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx index 39b20f0a40c1..a21b56cf8120 100644 --- a/sw/source/core/inc/UndoDelete.hxx +++ b/sw/source/core/inc/UndoDelete.hxx @@ -21,8 +21,8 @@ #define SW_UNDO_DELETE_HXX #include <undobj.hxx> +#include <rtl/ustring.hxx> #include <tools/mempool.hxx> -#include <tools/string.hxx> class SwRedlineSaveDatas; class SwTxtNode; diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx index a235a992aa42..3a046b2848f9 100644 --- a/sw/source/core/inc/UndoInsert.hxx +++ b/sw/source/core/inc/UndoInsert.hxx @@ -21,8 +21,8 @@ #define SW_UNDO_INSERT_HXX #include <undobj.hxx> +#include <rtl/ustring.hxx> #include <tools/mempool.hxx> -#include <tools/string.hxx> #include <swtypes.hxx> #include <IDocumentContentOperations.hxx> diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx index 5dd6b72a2848..b037e8f2169c 100644 --- a/sw/source/core/inc/UndoNumbering.hxx +++ b/sw/source/core/inc/UndoNumbering.hxx @@ -23,7 +23,7 @@ #include <vector> #include <undobj.hxx> #include <boost/shared_ptr.hpp> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <numrule.hxx> //----------- Undo for Numbering ------------------------------------- diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx index c21857bd5cc8..6e6f02bc66ed 100644 --- a/sw/source/core/inc/UndoOverwrite.hxx +++ b/sw/source/core/inc/UndoOverwrite.hxx @@ -21,7 +21,7 @@ #define SW_UNDO_OVERWRITE_HXX #include <com/sun/star/uno/Sequence.h> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <undobj.hxx> class SwRedlineSaveDatas; diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx index 0e5490ce8d0b..08b2d48417a6 100644 --- a/sw/source/core/inc/UndoSort.hxx +++ b/sw/source/core/inc/UndoSort.hxx @@ -22,7 +22,7 @@ #include <undobj.hxx> #include <boost/ptr_container/ptr_vector.hpp> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> struct SwSortOptions; class SwTableNode; diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx index 6783f2eaa6d3..a7ddbc530402 100644 --- a/sw/source/core/inc/retrieveinputstream.hxx +++ b/sw/source/core/inc/retrieveinputstream.hxx @@ -20,7 +20,7 @@ #define _RETRIEVEINPUTSTREAM_HXX #include <observablethread.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <retrievedinputstreamdata.hxx> diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index 8a8f9aacc865..88fea8872f16 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -19,17 +19,13 @@ #ifndef SW_VIEWIMP_HXX #define SW_VIEWIMP_HXX -#include <vector> - -#include <vcl/timer.hxx> +#include <rtl/ustring.hxx> #include <tools/color.hxx> - #include <svx/svdtypes.hxx> - -#include <tools/string.hxx> - -#include <swtypes.hxx> +#include <vcl/timer.hxx> #include <swrect.hxx> +#include <swtypes.hxx> +#include <vector> class ViewShell; class SwFlyFrm; diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 4cc95ddc164a..086c85af8bf9 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -29,6 +29,7 @@ #include <vector> #include <tools/color.hxx> +#include <tools/string.hxx> #include <viewopt.hxx> class SwWrongList; diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx index 1d03a6064b1b..6a35a95da24a 100644 --- a/sw/source/core/undo/SwUndoFmt.cxx +++ b/sw/source/core/undo/SwUndoFmt.cxx @@ -19,7 +19,6 @@ #include <tools/resid.hxx> -#include <tools/string.hxx> #include <poolfmt.hxx> #include <charfmt.hxx> diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index 91345de97e0a..3b895574a0fd 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -31,8 +31,7 @@ #include <comphelper/types.hxx> #include <tools/urlobj.hxx> #include <tools/datetime.hxx> -#include <tools/string.hxx> -#include "rtl/ustring.hxx" +#include <rtl/ustring.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/content.hxx> #include <swunohelper.hxx> diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index ce90177ed43b..7600816d00a6 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -28,7 +28,6 @@ #include <svl/languageoptions.hxx> #include <toolkit/awt/vclxdevice.hxx> -#include <tools/string.hxx> #include <tools/resary.hxx> #include <unotools/moduleoptions.hxx> #include <vcl/outdev.hxx> diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index fa1771d55af1..0a6818289280 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -24,7 +24,6 @@ #include <comphelper/string.hxx> #include <svx/svxids.hrc> #include "hintids.hxx" -#include <tools/string.hxx> #include <svl/urihelper.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 9eee98e34acf..f33696ca7f10 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -24,7 +24,6 @@ #include <map> #include <vector> #include <swtypes.hxx> //SwTwips -#include <tools/string.hxx> //String #include "wwstyles.hxx" //ww::sti #include <rtl/textenc.h> //rtl_TextEncoding #include <tools/gen.hxx> //Size diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/ui/inc/bookctrl.hxx index 32a61eec0086..8749c311d90e 100644 --- a/sw/source/ui/inc/bookctrl.hxx +++ b/sw/source/ui/inc/bookctrl.hxx @@ -19,8 +19,8 @@ #ifndef _BOOKCTRL_HXX #define _BOOKCTRL_HXX +#include <rtl/ustring.hxx> #include <sfx2/stbitem.hxx> -#include <tools/string.hxx> // class BookmarkToolBoxControl ------------------------------------------- diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx index 395100a5d7e4..133a43c2a3ca 100644 --- a/sw/source/ui/inc/caption.hxx +++ b/sw/source/ui/inc/caption.hxx @@ -19,7 +19,7 @@ #ifndef _CAPTION_HXX #define _CAPTION_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/globname.hxx> #include <SwCapObjType.hxx> #include "swdllapi.h" diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx index 26297e72cd8c..c8bfec0998c8 100644 --- a/sw/source/ui/inc/fontcfg.hxx +++ b/sw/source/ui/inc/fontcfg.hxx @@ -19,8 +19,8 @@ #ifndef _FONTCFG_HXX #define _FONTCFG_HXX +#include <rtl/ustring.hxx> #include <unotools/configitem.hxx> -#include <tools/string.hxx> #include <i18nlangtag/lang.h> #include <osl/diagnose.h> #include "swdllapi.h" diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx index 8c9fca86bb3c..0506ff843460 100644 --- a/sw/source/ui/inc/gloslst.hxx +++ b/sw/source/ui/inc/gloslst.hxx @@ -20,9 +20,8 @@ #ifndef _GLOSLST_HXX #define _GLOSLST_HXX - +#include <rtl/ustring.hxx> #include <tools/datetime.hxx> -#include <tools/string.hxx> #include <vcl/timer.hxx> class SwGlossaries; diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/ui/inc/navicont.hxx index 1cfc81a36459..6e2f3e39cdeb 100644 --- a/sw/source/ui/inc/navicont.hxx +++ b/sw/source/ui/inc/navicont.hxx @@ -20,7 +20,7 @@ #ifndef _NAVICONT_HXX #define _NAVICONT_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwDocShell; class TransferDataContainer; diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx index 1f689e3e5e99..243f7e672768 100644 --- a/sw/source/ui/inc/swcont.hxx +++ b/sw/source/ui/inc/swcont.hxx @@ -20,7 +20,7 @@ #ifndef _SWCONT_HXX #define _SWCONT_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> class SwContentType; diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index 5ecc7e1860b6..99bb459f4144 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -29,7 +29,6 @@ #include <ucbhelper/content.hxx> #include <unotools/streamwrap.hxx> #include <tools/stream.hxx> -#include <tools/string.hxx> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/container/XChild.hpp> diff --git a/ucb/workben/ucb/srcharg.cxx b/ucb/workben/ucb/srcharg.cxx index f6f417bf0f88..67836dc43807 100644 --- a/ucb/workben/ucb/srcharg.cxx +++ b/ucb/workben/ucb/srcharg.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/util/Date.hpp> #include <tools/date.hxx> #include <tools/inetmime.hxx> -#include <tools/string.hxx> #include <srcharg.hxx> diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx index 590646860cc3..4df47341a813 100644 --- a/uui/source/fltdlg.hxx +++ b/uui/source/fltdlg.hxx @@ -27,7 +27,6 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> -#include <tools/string.hxx> #include <vector> diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx index ea8070d05eaf..e62789f29ed1 100644 --- a/uui/source/loginerr.hxx +++ b/uui/source/loginerr.hxx @@ -20,7 +20,7 @@ #ifndef m_LOGINERR_HXX #define m_LOGINERR_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> //========================================================================= |