[Libreoffice-commits] core.git: 6 commits - cui/inc cui/source dbaccess/inc dbaccess/source desktop/source drawinglayer/inc drawinglayer/source editeng/source extensions/source extensions/workben forms/source fpicker/source framework/inc framework/source idl/inc idl/source include/tools lingucomponent/source linguistic/source oox/inc oox/source padmin/source reportdesign/inc reportdesign/source sc/inc sc/source sc/workben sd/source sfx2/source svl/source sw/inc sw/source tools/source ucb/source ucb/workben unusedcode.easy uui/source
Caolán McNamara
caolanm at redhat.com
Sun Oct 20 11:01:01 PDT 2013
cui/inc/pch/precompiled_cui.hxx | 1
cui/source/dialogs/plfilter.cxx | 2
cui/source/options/cfgchart.hxx | 1
cui/source/options/connpoolsettings.hxx | 1
dbaccess/inc/pch/precompiled_dbu.hxx | 1
dbaccess/source/core/api/tablecontainer.cxx | 1
dbaccess/source/ext/macromigration/dbmm_types.hxx | 2
dbaccess/source/ext/macromigration/migrationlog.cxx | 1
dbaccess/source/inc/dsntypes.hxx | 1
dbaccess/source/sdbtools/connection/objectnames.cxx | 1
dbaccess/source/sdbtools/connection/tablename.cxx | 1
dbaccess/source/ui/app/AppController.cxx | 1
dbaccess/source/ui/app/AppControllerDnD.cxx | 1
dbaccess/source/ui/inc/ConnectionLine.hxx | 1
dbaccess/source/ui/inc/DExport.hxx | 1
dbaccess/source/ui/inc/GeneralUndo.hxx | 1
dbaccess/source/ui/inc/QueryDesignView.hxx | 1
dbaccess/source/ui/inc/TableConnectionData.hxx | 1
dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 1
dbaccess/source/ui/inc/adtabdlg.hxx | 1
dbaccess/source/ui/inc/imageprovider.hxx | 1
dbaccess/source/ui/inc/indexes.hxx | 1
dbaccess/source/ui/inc/linkeddocuments.hxx | 1
dbaccess/source/ui/misc/UITools.cxx | 1
dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 1
dbaccess/source/ui/misc/singledoccontroller.cxx | 1
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 1
dbaccess/source/ui/tabledesign/TableController.cxx | 1
dbaccess/source/ui/tabledesign/TableRow.cxx | 1
desktop/source/app/cmdlinehelp.cxx | 1
desktop/source/app/dispatchwatcher.cxx | 1
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 1
desktop/source/deployment/inc/dp_resource.h | 1
desktop/source/deployment/misc/lockfile.cxx | 1
desktop/source/migration/services/wordbookmigration.cxx | 1
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 1
drawinglayer/inc/pch/precompiled_drawinglayer.hxx | 1
drawinglayer/source/attribute/fontattribute.cxx | 2
editeng/source/misc/swafopt.cxx | 6
extensions/source/dbpilots/dbptypes.hxx | 1
extensions/source/dbpilots/gridwizard.cxx | 1
extensions/source/plugin/base/xplugin.cxx | 1
extensions/source/plugin/inc/plugin/plcom.hxx | 1
extensions/source/propctrlr/formbrowsertools.cxx | 1
extensions/source/propctrlr/propertyinfo.hxx | 1
extensions/source/propctrlr/stringrepresentation.cxx | 1
extensions/source/scanner/sane.hxx | 1
extensions/workben/pythonautotest.cxx | 1
extensions/workben/pythontest.cxx | 1
forms/source/component/Currency.cxx | 1
forms/source/component/Filter.cxx | 1
forms/source/component/clickableimage.cxx | 1
forms/source/xforms/resourcehelper.cxx | 1
fpicker/source/aqua/resourceprovider.mm | 1
fpicker/source/office/asyncfilepicker.hxx | 1
fpicker/source/office/iodlgimp.hxx | 1
fpicker/source/office/pickercallbacks.hxx | 2
framework/inc/pch/precompiled_fwk.hxx | 1
framework/inc/services/licensedlg.hxx | 1
framework/inc/xml/imagesconfiguration.hxx | 1
framework/source/services/mediatypedetectionhelper.cxx | 1
framework/source/uielement/uicommanddescription.cxx | 1
idl/inc/bastype.hxx | 1
idl/inc/command.hxx | 1
idl/inc/hash.hxx | 3
idl/source/prj/svidl.cxx | 2
include/tools/string.hxx | 15 --
lingucomponent/source/languageguessing/guesslang.cxx | 1
lingucomponent/source/lingutil/lingutil.hxx | 1
linguistic/source/convdic.cxx | 1
linguistic/source/convdic.hxx | 1
linguistic/source/convdicxml.cxx | 1
linguistic/source/dicimp.cxx | 1
linguistic/source/dicimp.hxx | 1
linguistic/source/dlistimp.cxx | 1
linguistic/source/hhconvdic.cxx | 1
linguistic/source/hhconvdic.hxx | 1
linguistic/source/misc.cxx | 1
linguistic/source/misc2.cxx | 1
oox/inc/pch/precompiled_oox.hxx | 2
oox/source/export/drawingml.cxx | 1
oox/source/export/shapes.cxx | 1
oox/source/ole/axcontrol.cxx | 3
padmin/source/helper.hxx | 2
padmin/source/progress.cxx | 2
reportdesign/inc/UndoActions.hxx | 1
reportdesign/source/core/api/ReportEngineJFree.cxx | 1
reportdesign/source/ui/inc/metadata.hxx | 1
reportdesign/source/ui/inspection/GeometryHandler.cxx | 1
reportdesign/source/ui/misc/UITools.cxx | 1
reportdesign/source/ui/report/ReportController.cxx | 1
sc/inc/address.hxx | 1
sc/inc/chartuno.hxx | 1
sc/inc/docpool.hxx | 2
sc/inc/document.hxx | 8 -
sc/inc/dpdimsave.hxx | 1
sc/inc/dptabres.hxx | 1
sc/inc/dptabsrc.hxx | 1
sc/inc/filter.hxx | 17 +-
sc/inc/global.hxx | 4
sc/inc/lookupcache.hxx | 1
sc/inc/patattr.hxx | 1
sc/inc/pch/precompiled_sc.hxx | 1
sc/inc/pch/precompiled_vbaobj.hxx | 1
sc/inc/progress.hxx | 2
sc/inc/rangeutl.hxx | 2
sc/inc/scabstdlg.hxx | 1
sc/inc/stringutil.hxx | 5
sc/inc/targuno.hxx | 1
sc/inc/userlist.hxx | 1
sc/inc/zforauto.hxx | 6
sc/source/core/data/documen8.cxx | 1
sc/source/core/inc/interpre.hxx | 1
sc/source/core/tool/zforauto.cxx | 4
sc/source/filter/dif/difexp.cxx | 6
sc/source/filter/dif/difimp.cxx | 6
sc/source/filter/excel/xistream.cxx | 2
sc/source/filter/inc/dif.hxx | 12 -
sc/source/filter/inc/eeparser.hxx | 1
sc/source/filter/inc/excscen.hxx | 3
sc/source/filter/inc/exp_op.hxx | 4
sc/source/filter/inc/ftools.hxx | 15 +-
sc/source/filter/inc/lotfntbf.hxx | 1
sc/source/filter/inc/root.hxx | 4
sc/source/filter/inc/xestyle.hxx | 1
sc/source/filter/rtf/rtfexp.cxx | 2
sc/source/ui/docshell/impex.cxx | 10 -
sc/source/ui/inc/AccessibleCsvControl.hxx | 1
sc/source/ui/inc/asciiopt.hxx | 1
sc/source/ui/inc/autostyl.hxx | 4
sc/source/ui/inc/gridwin.hxx | 1
sc/source/ui/inc/lnktrans.hxx | 2
sc/source/ui/unoobj/pageuno.cxx | 2
sc/source/ui/vba/vbaworksheet.cxx | 2
sc/source/ui/vba/vbaworksheets.cxx | 1
sc/workben/result.hxx | 2
sd/source/ui/inc/MasterPageObserver.hxx | 2
sfx2/source/appl/shutdowniconaqua.mm | 2
sfx2/source/menu/mnumgr.cxx | 2
svl/source/svdde/ddesvr.cxx | 2
sw/inc/IDocumentListItems.hxx | 2
sw/inc/IDocumentListsAccess.hxx | 2
sw/inc/IDocumentOutlineNodes.hxx | 2
sw/inc/acmplwrd.hxx | 2
sw/inc/calc.hxx | 6
sw/inc/ccoll.hxx | 10 -
sw/inc/crsrsh.hxx | 1
sw/inc/dbgoutsw.hxx | 2
sw/inc/dbmgr.hxx | 3
sw/inc/docsh.hxx | 1
sw/inc/editsh.hxx | 1
sw/inc/fmtcol.hxx | 2
sw/inc/fmtrfmrk.hxx | 3
sw/inc/frmfmt.hxx | 1
sw/inc/ftninfo.hxx | 2
sw/inc/index.hxx | 1
sw/inc/iodetect.hxx | 4
sw/inc/list.hxx | 2
sw/inc/paratr.hxx | 1
sw/inc/pch/precompiled_sw.hxx | 1
sw/inc/redline.hxx | 2
sw/inc/shellres.hxx | 2
sw/inc/sortopt.hxx | 2
sw/inc/swabstdlg.hxx | 1
sw/inc/swcalwrp.hxx | 2
sw/inc/txtfld.hxx | 2
sw/inc/unochart.hxx | 1
sw/inc/unosrch.hxx | 2
sw/inc/unotbl.hxx | 1
sw/inc/viewopt.hxx | 1
sw/source/core/bastyp/index.cxx | 2
sw/source/core/bastyp/swtypes.cxx | 2
sw/source/core/doc/dbgoutsw.cxx | 2
sw/source/core/inc/UndoAttribute.hxx | 2
sw/source/core/inc/UndoCore.hxx | 2
sw/source/core/inc/UndoDelete.hxx | 2
sw/source/core/inc/UndoInsert.hxx | 2
sw/source/core/inc/UndoNumbering.hxx | 2
sw/source/core/inc/UndoOverwrite.hxx | 2
sw/source/core/inc/UndoSort.hxx | 2
sw/source/core/inc/retrieveinputstream.hxx | 2
sw/source/core/inc/viewimp.hxx | 12 -
sw/source/core/inc/wrong.hxx | 1
sw/source/core/undo/SwUndoFmt.cxx | 1
sw/source/core/unocore/swunohelper.cxx | 3
sw/source/core/view/printdata.cxx | 1
sw/source/filter/html/htmlfly.cxx | 1
sw/source/filter/inc/msfilter.hxx | 1
sw/source/ui/inc/bookctrl.hxx | 2
sw/source/ui/inc/caption.hxx | 2
sw/source/ui/inc/fontcfg.hxx | 2
sw/source/ui/inc/gloslst.hxx | 3
sw/source/ui/inc/navicont.hxx | 2
sw/source/ui/inc/swcont.hxx | 2
tools/source/string/tustring.cxx | 73 -----------
ucb/source/core/FileAccess.cxx | 1
ucb/workben/ucb/srcharg.cxx | 1
unusedcode.easy | 1
uui/source/fltdlg.hxx | 1
uui/source/loginerr.hxx | 2
200 files changed, 131 insertions(+), 345 deletions(-)
New commits:
commit b42f8b451efa46d1aa62184541209e858d798b82
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 20 18:59:40 2013 +0100
STRING_MATCH now unused
Change-Id: Ieb0364d275d052a6d6d0b1398f8cf16145ff948d
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 482d098..ea43eb8 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -63,12 +63,10 @@ typedef rtl_TextEncoding CharSet;
#ifdef STRING32
#define STRING_NOTFOUND ((xub_StrLen)0x7FFFFFFF)
-#define STRING_MATCH ((xub_StrLen)0x7FFFFFFF)
#define STRING_LEN ((xub_StrLen)0x7FFFFFFF)
#define STRING_MAXLEN ((xub_StrLen)0x7FFFFFFF)
#else
#define STRING_NOTFOUND ((xub_StrLen)0xFFFF)
-#define STRING_MATCH ((xub_StrLen)0xFFFF)
#define STRING_LEN ((xub_StrLen)0xFFFF)
#define STRING_MAXLEN ((xub_StrLen)0xFFFF)
#endif
commit d89be2a78a7eca277bf2316258d79c0979999652
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 20 17:04:00 2013 +0100
STRING_LEN is the same as STRING_NOTFOUND
So use -1 here to realign logic to what it was before
35c24f9b6e08ef1328df01b2d3d11ef518897130. Though it
doesn't matter because aThesLookUpStr is going to be
empty in the case where we would examine the default
value of nDelimPos
Change-Id: I369c4e6903407b525dc0dcee9d507e90590eeb6b
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 344834a..a1b3186 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -138,7 +138,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
pBindings->QueryState( SID_THES, pItem );
OUString aThesLookUpStr;
SfxStringItem *pStrItem = dynamic_cast< SfxStringItem * >(pItem);
- sal_Int32 nDelimPos = STRING_LEN;
+ sal_Int32 nDelimPos = -1;
if (pStrItem)
{
aThesLookUpStr = pStrItem->GetValue();
commit 3f16ec73e07b7c187200656cfa969d71b4bea7b3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 20 15:51:49 2013 +0100
wrong comparison
regression since ed338bc212725f422f0def21aafc82f05e350646
Change-Id: Ia5dfe7a551abe244c313d3bdb2b90196fc0c6ba2
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 43d7fc6..a2c4190 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -2609,7 +2609,7 @@ HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm )
displayValue = displayValue.replaceAll( """, "\"" );
displayValue = displayValue.replaceAll( "&", "&" );
listValues.push_back( displayValue );
- if( sLine.indexOf( sSelected ) != STRING_NOTFOUND )
+ if( sLine.indexOf( sSelected ) != -1 )
selectedIndices.push_back( static_cast< sal_Int16 >( listValues.size() ) - 1 );
}
}
commit 45e366eadbba69140214a8e745a1d3ce3e4e8337
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 20 15:15:42 2013 +0100
drop unnecessary tools/string includes
Change-Id: I4278999b9b7d184c26036bbe9e3b98420f461e8c
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 59c0dde..a1bc8d6 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 34653e1..034e67f 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 71ec42f..e2a881d 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 01ffccf..59c07615 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 d83f4b3..723df66 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 422a2fe..32400c8 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 7ae52e9..dec92b2 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 6f45ad7..6f476ae 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 0395dc5..f5fe334 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 39f4ffa..668bee9 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 96ca135..bbef65c 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 a46169e..2198d48 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 195c52a..b712ca6 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 5505e0e..5ef9406 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 64e5279..9684c4d 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 b3f02df..af4b623 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 f49614b..cea979f 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 5e8220b..877f659 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 696113f..92744e7 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 94dd32a..0ebc17b 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 a6c816d..294ec5b 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 72afcd4..4dde86d 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 f935ead..fa94425 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 d79aa47..6c6126f 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 4250b69..164ef07 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 ca9a10e..de9d549 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 059c6f7..c41a78d 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 c6c4959..1aeca67 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 aa122ae..de928de 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 8311c5d..ab46302 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 53a9ed2..6072124 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 3c15ca3..1495910 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 ebd8331..f5a6211 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 9641cbf..204eec1 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 d359f18..c291ac7 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 35ae4ec..e268c0e 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 e316a1a..4875297 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 3a38068..16f1785 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 d291179..63fb473 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 2f0aa39..3b99d4c 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 2a61ab5..a0be027 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 0a44249..1f9fd13 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 fc1e2a9..b685abc 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 d7b0660..10193bc 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 597a06f..2bbf5b7 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 ccc356a..770937b 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 3ecfa76..0cb8a78 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 edf7387..fb6b66b 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 c1c6bdb..e6b9729 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 5345b34..53bdc1f 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 1c1df46..cfe1451 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 cf9b272..df1dd01 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 ac12538..b6641a0 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 1b64ffc..f0a1df8 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 d49bf45..f595c0b 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 a780984..b024581 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 32bef92..e8c19f5 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 3e0a3b0..8796f37 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 3d0d385..a67b493 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 7a5fbda..ce85a15 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 339fb87..2bf7912 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 f68f481..42cd389 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 f976723..f03f3f6 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 c82211d..3ee2bcb 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 115d09e..ee3ba12 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 b9dc81e..3971415 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 b5370e7..e6406d2 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 f4e7d08..f5f1d76 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 fb00d9d..5ef6f8d 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 3261ffd..c00656f 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 4bd17fc..c454824 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 f14792c..82d4e7e 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 c8ea578..a488c4a 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 2267e20..f90a6b0 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 090f0e9..03a3731 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 1ffda09..8b72e60 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 fe24438..1a7f617 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 726493e..abb8e3b 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 5ee4dd5..0fda8ba 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 af1d6e0..7a75d88 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 968d079..429472b 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 7097290..43d7fc6 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 cfaca58..ea0babe 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 ec6e5c1..160749c 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 ad7f4ce..1bcb131 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 709a1c9..b2f90da 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 f990d97..50f8222 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 754c6c6..c53a077 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 3431008b..781395b 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 dbeceb9..be3ab49 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 7fcd1f0..f764e08 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 45c7421..3094b64 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 c794148..cacc9ee 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 f7df5f61..20222fa 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 13d9faa..375e76a 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 4017fe1..4610f20 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 60f9212..b2d7a41 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 6f66073..2a3b9f5 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 4db7beb..0698fbc 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 9bfc541..0b6c53b 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 317f9ae..cf09d54 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 4ab5709..54b944f 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 67c8557..c48f015 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 4d3194f..3c3c5f8 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 26fe589..3b51c26 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 fe3cf06..d5f6876 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 5984da7..08e5c1e 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 f18ee62..5c37de4 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 0adb005..0cecf31 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 c132a8a..dfadff3 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 980866d..cb5162b 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 99fa566..bece096 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 1655b2d..7dc049b 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 fce42c2..de90f1d 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 fd9447d..53c1a6c 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 c17cdfe..d4cb870 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 8ff0086..51daa73 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 7ef1583..ab7b209 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 49a6e42..8ec46e3 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 39b6f0e..1a6ce47 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 23b205c..b8d5cc7 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 a5430cf..21fb956 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 492a463..8cb446d 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 d6950ee..77061c8 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 bb024e0..e0efa75 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 85868ec..d2c1d1e 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 822aec9..ece01e9 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 3a40ae5..9f1200e 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 d449866..d6db458 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 b25f849..8755da8 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 705a245..d9ccdeb 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 2f36768..c4d485d 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 b31a0ab..078c9e9 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 4a3545c..5d19147 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 06cb8f9..835ae47c 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 19112e33..9e7221e 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 ebeda04..bcc0449 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 77c85a9..beeb3d8 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 f4e766a..c6ced05 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 1c072f7..4351d6f 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 80a0fde..0fc0156 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 9b6adc3..47795c4 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 fa3d0ff..d754203 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 6935b84..e3f64d8 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 e984329..8994c37 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 118dba8..8ad766f 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 d5b2070..9ab0b91 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 333d6db..1891f3a 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 013fcdc..d3a1aa5 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 8b89070..590f534 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 f1b8975..b8ea333 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 f322e75..bfe0c25 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 a5f1e84..aaad290 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 e664538..6934c26 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 e347c19..ef9933d 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 5b0a703..1d85296 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 b6b5543..56093c2 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 053b441..2ffc449 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 df7a92b..6a2750b 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 3f1bcf6..85d5d95 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 87029f4..f8a3bf1 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 2e03953..f5ed3bf 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 f624ad7..d98d0ff 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 55aab0f..33ce24e 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 656d1c4..16baeac 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 9b683bb..63d3f72 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 342759d..19f1db8 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 3a91d57..93683e2 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 880998a..7a3e68f 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 0e6b2ac..42c9d13 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 75c5c71..233326a 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 46dee45..72c82bc 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 fd9c201..e71e9d0 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 39b20f0..a21b56c 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 a235a99..3a046b2 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 5dd6b72..b037e8f 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 c21857b..6e6f02b 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 0e5490c..08b2d48 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 6783f2e..a7ddbc5 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 8a8f9aa..88fea88 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 4cc95dd..086c85a 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 1d03a60..6a35a95 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 91345de..3b89557 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 ce90177..7600816 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 fa1771d..0a68182 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 9eee98e..f33696c 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 32a61ee..8749c31 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 395100a..133a43c 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 26297e7..c8bfec0 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 8c9fca8..0506ff8 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 1cfc81a..6e2f3e3 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 1f689e3..243f7e6 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 5ecc7e1..99bb459 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 f6f417b..67836dc 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 5906468..4df4734 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 ea8070d..e62789f 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>
//=========================================================================
commit 8bb4b18127cdc6259ecd65ec0f28d27d0513cb26
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 20 12:07:34 2013 +0100
Related: fdo#38838 remove String::Equals
Change-Id: Ib85907c9e274ba4e4f4c9394f3d4ecf0c9374603
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 13c3ce0..482d098 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -140,8 +140,6 @@ private:
TOOLS_DLLPRIVATE UniString& Append( const sal_Unicode* pCharStr );
TOOLS_DLLPRIVATE UniString& Append( const sal_Unicode* pCharStr, xub_StrLen nLen );
TOOLS_DLLPRIVATE UniString& Expand( xub_StrLen nCount, sal_Unicode cExpandChar );
- TOOLS_DLLPRIVATE sal_Bool Equals( const sal_Unicode* pCharStr,
- xub_StrLen nIndex, xub_StrLen nLen ) const;
TOOLS_DLLPRIVATE UniString& Insert( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen,
xub_StrLen nIndex = STRING_LEN );
@@ -220,14 +218,9 @@ public:
UniString& Insert( sal_Unicode c, xub_StrLen nIndex = STRING_LEN );
UniString Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ) const;
- sal_Bool Equals( const UniString& rStr ) const;
- sal_Bool Equals( const UniString& rStr,
- xub_StrLen nIndex, xub_StrLen nLen ) const;
-
const sal_Unicode* GetBuffer() const { return mpData->maStr; }
- friend sal_Bool operator == ( const UniString& rStr1, const UniString& rStr2 )
- { return rStr1.Equals( rStr2 ); }
+ friend sal_Bool operator == ( const UniString& rStr1, const UniString& rStr2 );
friend sal_Bool operator != ( const UniString& rStr1, const UniString& rStr2 )
{ return !(operator == ( rStr1, rStr2 )); }
friend sal_Bool operator < ( const UniString& rStr1, const UniString& rStr2 )
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index c460422..3d174a4 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -110,37 +110,15 @@ StringCompare STRING::CompareTo( const STRING& rStr, xub_StrLen nLen ) const
return COMPARE_GREATER;
}
-sal_Bool STRING::Equals( const STRING& rStr ) const
+sal_Bool operator==(const UniString& rStr1, const UniString& rStr2)
{
- DBG_CHKTHIS( STRING, DBGCHECKSTRING );
- DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING );
-
- if ( mpData == rStr.mpData )
+ if ( rStr1.mpData == rStr2.mpData )
return sal_True;
- if ( mpData->mnLen != rStr.mpData->mnLen )
+ if ( rStr1.mpData->mnLen != rStr2.mpData->mnLen )
return sal_False;
- return (ImplStringCompareWithoutZero( mpData->maStr, rStr.mpData->maStr, mpData->mnLen ) == 0);
-}
-
-sal_Bool STRING::Equals( const STRING& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const
-{
- DBG_CHKTHIS( STRING, DBGCHECKSTRING );
- DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING );
-
- // Are there enough codes for comparing?
- if ( nIndex > mpData->mnLen )
- return (rStr.mpData->mnLen == 0);
- sal_Int32 nMaxLen = mpData->mnLen-nIndex;
- if ( nMaxLen < nLen )
- {
- if ( rStr.mpData->mnLen != nMaxLen )
- return sal_False;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list