[Libreoffice-commits] core.git: 3 commits - accessibility/inc basic/source chart2/source connectivity/source cui/source dbaccess/source editeng/source extensions/source filter/source forms/source fpicker/source framework/source include/connectivity include/drawinglayer include/editeng include/filter include/formula include/linguistic include/sfx2 include/svl include/svx include/tools include/ucbhelper include/vcl odk/examples padmin/source reportdesign/source sc/inc sc/source sd/source sfx2/source svl/source svx/inc svx/source sw/inc sw/source tools/source ucbhelper/source vcl/generic vcl/inc vcl/source vcl/workben
Caolán McNamara
caolanm at redhat.com
Wed Sep 25 10:24:53 PDT 2013
accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx | 2
basic/source/uno/namecont.cxx | 6
chart2/source/controller/accessibility/AccessibleChartView.cxx | 2
chart2/source/controller/dialogs/DialogModel.cxx | 2
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 2
chart2/source/tools/ResId.cxx | 1
chart2/source/view/main/ChartItemPool.cxx | 4
connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 1
connectivity/source/drivers/dbase/DDatabaseMetaData.cxx | 1
connectivity/source/drivers/dbase/DIndexIter.cxx | 1
connectivity/source/drivers/file/FDatabaseMetaData.cxx | 1
connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx | 2
connectivity/source/inc/ado/ADatabaseMetaData.hxx | 3
connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx | 2
connectivity/source/inc/ado/AResultSetMetaData.hxx | 2
connectivity/source/inc/ado/AStatement.hxx | 2
connectivity/source/inc/file/FConnection.hxx | 6
connectivity/source/inc/file/FStatement.hxx | 3
connectivity/source/inc/file/fcomp.hxx | 2
connectivity/source/inc/odbc/OResultSetMetaData.hxx | 2
connectivity/source/inc/propertyids.hxx | 2
cui/source/dialogs/hldocntp.cxx | 8 -
cui/source/dialogs/hldoctp.cxx | 36 ++--
cui/source/dialogs/hlinettp.cxx | 16 +-
cui/source/dialogs/hlmailtp.cxx | 4
cui/source/dialogs/hltpbase.cxx | 22 +-
cui/source/dialogs/plfilter.cxx | 2
cui/source/inc/cfgutil.hxx | 1
cui/source/inc/cuifmsearch.hxx | 2
cui/source/inc/dbregister.hxx | 8 -
cui/source/inc/hldocntp.hxx | 2
cui/source/inc/hldoctp.hxx | 6
cui/source/inc/hlinettp.hxx | 2
cui/source/inc/hlmailtp.hxx | 2
cui/source/inc/hltpbase.hxx | 4
cui/source/inc/iconcdlg.hxx | 8 -
cui/source/inc/numfmt.hxx | 10 -
cui/source/options/cfgchart.hxx | 1
cui/source/options/connpoolsettings.hxx | 3
cui/source/tabpages/macroass.cxx | 4
dbaccess/source/ui/dlg/dbfindex.cxx | 10 -
dbaccess/source/ui/dlg/dbfindex.hxx | 14 -
dbaccess/source/ui/inc/GeneralUndo.hxx | 1
dbaccess/source/ui/inc/JoinDesignView.hxx | 2
dbaccess/source/ui/inc/RelationDesignView.hxx | 2
dbaccess/source/ui/inc/RtfReader.hxx | 2
dbaccess/source/ui/inc/TableWindowListBox.hxx | 2
dbaccess/source/ui/misc/HtmlReader.cxx | 8 -
dbaccess/source/ui/misc/charsets.cxx | 2
dbaccess/source/ui/misc/singledoccontroller.cxx | 1
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 20 +-
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 2
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 4
editeng/source/rtf/svxrtf.cxx | 16 +-
editeng/source/uno/unofdesc.cxx | 2
extensions/source/bibliography/datman.cxx | 8 -
extensions/source/bibliography/framectr.cxx | 4
extensions/source/propctrlr/eformshelper.cxx | 4
filter/source/svg/svgwriter.hxx | 1
forms/source/component/Currency.cxx | 1
forms/source/component/Filter.cxx | 1
forms/source/component/clickableimage.cxx | 1
fpicker/source/office/OfficeFilePicker.cxx | 6
fpicker/source/office/iodlg.cxx | 16 +-
framework/source/services/autorecovery.cxx | 2
framework/source/services/desktop.cxx | 2
framework/source/services/frame.cxx | 1
framework/source/services/sessionlistener.cxx | 1
framework/source/services/tabwindowservice.cxx | 2
framework/source/services/taskcreatorsrv.cxx | 1
framework/source/services/urltransformer.cxx | 5
include/connectivity/CommonTools.hxx | 2
include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx | 2
include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx | 2
include/drawinglayer/primitive2d/textprimitive2d.hxx | 2
include/editeng/AccessibleEditableTextPara.hxx | 2
include/editeng/AccessibleStringWrap.hxx | 5
include/editeng/charsetcoloritem.hxx | 2
include/editeng/editstat.hxx | 2
include/editeng/edtdlg.hxx | 2
include/editeng/fontitem.hxx | 4
include/editeng/itemtype.hxx | 2
include/editeng/numitem.hxx | 2
include/editeng/outliner.hxx | 8 -
include/editeng/outlobj.hxx | 8 -
include/editeng/splwrap.hxx | 4
include/editeng/svxrtf.hxx | 2
include/editeng/swafopt.hxx | 6
include/editeng/unoedsrc.hxx | 4
include/editeng/unolingu.hxx | 2
include/filter/msfilter/rtfutil.hxx | 5
include/filter/msfilter/svdfppt.hxx | 2
include/formula/FormulaCompiler.hxx | 8 -
include/formula/IFunctionDescription.hxx | 2
include/formula/formdata.hxx | 4
include/formula/formulahelper.hxx | 6
include/linguistic/misc.hxx | 2
include/sfx2/docfile.hxx | 19 --
include/sfx2/docfilt.hxx | 15 -
include/sfx2/docinsert.hxx | 5
include/sfx2/doctempl.hxx | 8 -
include/sfx2/event.hxx | 1
include/sfx2/filedlghelper.hxx | 1
include/sfx2/frame.hxx | 7
include/sfx2/frmdescr.hxx | 9 -
include/sfx2/linkmgr.hxx | 9 -
include/sfx2/lnkbase.hxx | 8 -
include/sfx2/mailmodelapi.hxx | 8 -
include/sfx2/mieclip.hxx | 8 -
include/sfx2/minfitem.hxx | 7
include/sfx2/mnuitem.hxx | 13 -
include/sfx2/msgpool.hxx | 10 -
include/sfx2/objface.hxx | 13 -
include/sfx2/shell.hxx | 14 -
include/sfx2/styfitem.hxx | 7
include/sfx2/tplpitem.hxx | 8 -
include/sfx2/viewfac.hxx | 6
include/svl/itempool.hxx | 7
include/svl/macitem.hxx | 4
include/svl/nfkeytab.hxx | 4
include/svl/undo.hxx | 4
include/svl/urlbmk.hxx | 3
include/svx/ParseContext.hxx | 6
include/svx/XPropertyEntry.hxx | 2
include/svx/fmsearch.hxx | 14 -
include/svx/gallery1.hxx | 6
include/svx/hlnkitem.hxx | 4
include/svx/nbdtmg.hxx | 1
include/svx/pageitem.hxx | 1
include/svx/svdetc.hxx | 9 -
include/svx/svdglob.hxx | 3
include/svx/svdmark.hxx | 8 -
include/svx/svdmodel.hxx | 2
include/svx/svdobj.hxx | 18 +-
include/svx/svdpagv.hxx | 6
include/svx/svdtrans.hxx | 10 -
include/svx/swframeposstrings.hxx | 4
include/svx/txenctab.hxx | 6
include/svx/xmlexchg.hxx | 4
include/svx/xtable.hxx | 2
include/tools/string.hxx | 7
include/ucbhelper/providerhelper.hxx | 2
include/vcl/FilterConfigItem.hxx | 2
include/vcl/abstdlg.hxx | 2
include/vcl/controllayout.hxx | 4
include/vcl/edit.hxx | 1
include/vcl/font.hxx | 2
include/vcl/gfxlink.hxx | 6
include/vcl/graph.h | 4
include/vcl/i18nhelp.hxx | 4
include/vcl/keycod.hxx | 4
include/vcl/mnemonic.hxx | 4
include/vcl/ppdparser.hxx | 9 -
include/vcl/quickselectionengine.hxx | 6
include/vcl/stdtext.hxx | 2
include/vcl/strhelper.hxx | 8 -
include/vcl/svapp.hxx | 2
include/vcl/textdata.hxx | 4
include/vcl/texteng.hxx | 5
include/vcl/textview.hxx | 5
include/vcl/txtattr.hxx | 6
include/vcl/unohelp2.hxx | 2
odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx | 2
padmin/source/helper.cxx | 4
reportdesign/source/core/api/ReportEngineJFree.cxx | 1
sc/inc/compiler.hxx | 2
sc/inc/docpool.hxx | 1
sc/inc/global.hxx | 2
sc/inc/progress.hxx | 1
sc/source/core/data/global.cxx | 22 +-
sc/source/core/tool/compiler.cxx | 16 +-
sc/source/core/tool/interpr2.cxx | 28 +--
sc/source/filter/excel/excimp8.cxx | 4
sc/source/filter/excel/impop.cxx | 2
sc/source/filter/excel/xeescher.cxx | 2
sc/source/filter/excel/xestyle.cxx | 8 -
sc/source/filter/excel/xilink.cxx | 4
sc/source/filter/excel/xiname.cxx | 3
sc/source/filter/excel/xistyle.cxx | 8 -
sc/source/filter/excel/xlstyle.cxx | 4
sc/source/filter/excel/xltools.cxx | 14 -
sc/source/filter/ftools/ftools.cxx | 25 +--
sc/source/filter/html/htmlpars.cxx | 16 +-
sc/source/filter/inc/dif.hxx | 1
sc/source/filter/inc/excrecds.hxx | 5
sc/source/filter/inc/ftools.hxx | 4
sc/source/filter/inc/lotfntbf.hxx | 2
sc/source/filter/inc/lotform.hxx | 5
sc/source/filter/inc/lotimpop.hxx | 2
sc/source/filter/inc/qpro.hxx | 2
sc/source/filter/inc/qprostyle.hxx | 2
sc/source/filter/inc/xilink.hxx | 8 -
sc/source/filter/inc/xlstyle.hxx | 2
sc/source/filter/lotus/op.cxx | 4
sc/source/filter/lotus/tool.cxx | 3
sc/source/filter/xml/xmlcelli.cxx | 7
sc/source/ui/dbgui/imoptdlg.cxx | 4
sc/source/ui/inc/lnktrans.hxx | 2
sc/source/ui/unoobj/filtuno.cxx | 4
sc/source/ui/unoobj/servuno.cxx | 9 -
sd/source/ui/inc/MasterPageObserver.hxx | 1
sfx2/source/bastyp/sfxhtml.cxx | 1
svl/source/items/aeitem.cxx | 4
svl/source/items/sitem.cxx | 9 -
svl/source/misc/fstathelper.cxx | 8 -
svl/source/numbers/zforscan.hxx | 6
svl/source/svdde/ddeimp.hxx | 4
svx/inc/pch/precompiled_svx.hxx | 1
svx/inc/pch/precompiled_svxcore.hxx | 1
svx/source/accessibility/DescriptionGenerator.cxx | 1
svx/source/core/graphichelper.cxx | 1
svx/source/inc/charmapacc.hxx | 1
svx/source/inc/stringlistresource.hxx | 1
svx/source/svdraw/svdmodel.cxx | 1
svx/source/xoutdev/xpool.cxx | 4
sw/inc/acmplwrd.hxx | 1
sw/inc/docsh.hxx | 1
sw/inc/fmtcol.hxx | 7
sw/inc/frmfmt.hxx | 1
sw/inc/paratr.hxx | 1
sw/source/core/bastyp/calc.cxx | 14 -
sw/source/core/inc/UndoAttribute.hxx | 1
sw/source/core/inc/UndoCore.hxx | 1
sw/source/core/inc/UndoDelete.hxx | 1
sw/source/core/inc/UndoInsert.hxx | 1
sw/source/core/inc/UndoNumbering.hxx | 1
sw/source/core/inc/UndoOverwrite.hxx | 3
sw/source/core/inc/UndoSort.hxx | 1
sw/source/core/inc/UndoTable.hxx | 1
sw/source/filter/html/htmlcss1.cxx | 5
sw/source/filter/html/htmlfld.cxx | 8 -
sw/source/filter/html/htmlgrin.cxx | 6
sw/source/filter/html/htmlsect.cxx | 6
sw/source/filter/html/swhtml.cxx | 23 +-
sw/source/filter/html/swhtml.hxx | 4
sw/source/filter/ww1/w1filter.cxx | 59 +++----
sw/source/filter/ww8/ww8glsy.cxx | 6
sw/source/filter/ww8/ww8glsy.hxx | 2
sw/source/filter/ww8/ww8par.cxx | 12 -
sw/source/filter/ww8/ww8par4.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 61 +++----
sw/source/filter/ww8/ww8scan.cxx | 10 -
sw/source/filter/ww8/ww8scan.hxx | 6
sw/source/ui/dbui/dbmgr.cxx | 20 +-
sw/source/ui/dochdl/swdtflvr.cxx | 4
sw/source/ui/fldui/flddb.cxx | 8 -
sw/source/ui/fldui/flddinf.cxx | 8 -
sw/source/ui/fldui/flddok.cxx | 8 -
sw/source/ui/fldui/fldfunc.cxx | 8 -
sw/source/ui/fldui/fldref.cxx | 10 -
sw/source/ui/fldui/fldvar.cxx | 8 -
sw/source/ui/vba/vbafield.cxx | 14 -
tools/source/string/strascii.cxx | 80 ----------
tools/source/string/tustring.cxx | 63 -------
ucbhelper/source/provider/propertyvalueset.cxx | 2
vcl/generic/fontmanager/helper.cxx | 12 -
vcl/inc/fontcache.hxx | 8 -
vcl/inc/fontsubset.hxx | 2
vcl/inc/impfont.hxx | 2
vcl/inc/outfont.hxx | 2
vcl/inc/salwtype.hxx | 2
vcl/inc/svdata.hxx | 3
vcl/inc/textlayout.hxx | 6
vcl/inc/toolbox.h | 2
vcl/inc/unx/i18n_status.hxx | 2
vcl/inc/unx/wmadaptor.hxx | 2
vcl/source/edit/textdoc.cxx | 3
vcl/source/edit/textdoc.hxx | 3
vcl/source/filter/FilterConfigCache.hxx | 3
vcl/source/gdi/jobset.cxx | 5
vcl/source/window/abstdlg.cxx | 5
vcl/workben/outdevgrind.cxx | 2
272 files changed, 698 insertions(+), 944 deletions(-)
New commits:
commit 8e30689680c04efc4fc14f6247b5d90e50bc3c0d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 23 16:22:47 2013 +0200
drop worthless _VECTOR_/_MAP_ header guards
Change-Id: I54be19847b8fb609f0b08a528cc06dbae9f579d5
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index 2b690d1..efcc7b4 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -19,6 +19,7 @@
#include "dbase/DIndexIter.hxx"
#include <com/sun/star/sdb/SQLFilterOperator.hpp>
+#include <tools/string.hxx>
using namespace ::com::sun::star::sdb;
using namespace connectivity;
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
index a50fcda..e940948 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
@@ -22,9 +22,7 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase1.hxx>
-#ifndef _VECTOR_
#include <vector>
-#endif
#include "FDatabaseMetaDataResultSet.hxx"
#include "OColumn.hxx"
#include "connectivity/StdTypeDefs.hxx"
diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
index 790b3cd..759cdf4 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
@@ -21,10 +21,7 @@
#define _CONNECTIVITY_ADO_ADATABASEMETADATA_HXX_
#include "TDatabaseMetaDataBase.hxx"
-#ifndef _MAP_
#include <map>
-#endif
-
namespace connectivity
{
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index 7e09c6c..5519bea 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
@@ -22,9 +22,7 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase1.hxx>
-#ifndef _VECTOR_
#include <vector>
-#endif
#include "ado/Awrapado.hxx"
#include "ado/ADatabaseMetaDataResultSet.hxx"
#include "OColumn.hxx"
diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx
index 4c12b16..4f12c24 100644
--- a/connectivity/source/inc/ado/AResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx
@@ -22,9 +22,7 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase1.hxx>
-#ifndef _VECTOR_
#include <vector>
-#endif
#include "ado/Awrapado.hxx"
#include "ado/AResultSet.hxx"
#include "OColumn.hxx"
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index cc8f5d1..1e92886 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -32,9 +32,7 @@
#include <comphelper/uno3.hxx>
#include <comphelper/broadcasthelper.hxx>
#include "ado/AConnection.hxx"
-#ifndef _LIST_
#include <list>
-#endif
#include "ado/Awrapado.hxx"
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index b18eb0d..a9483b9 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -34,9 +34,7 @@
#include "connectivity/CommonTools.hxx"
#include "file/FConnection.hxx"
#include "file/filedllapi.hxx"
-#ifndef _LIST_
#include <list>
-#endif
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/propertycontainer.hxx>
#include "file/fanalyzer.hxx"
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 1bffe4f..91cba8d 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -21,9 +21,7 @@
#include "file/fcode.hxx"
#include "file/filedllapi.hxx"
-#ifndef _LIST_
#include <list>
-#endif
namespace connectivity
{
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index e87ad17..bc7582b 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -24,9 +24,7 @@
#include <cppuhelper/implbase1.hxx>
#include "odbc/OFunctions.hxx"
#include "odbc/odbcbasedllapi.hxx"
-#ifndef _VECTOR_
#include <vector>
-#endif
#include "odbc/OConnection.hxx"
namespace connectivity
diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index d2b7d38..150cb3f 100644
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
@@ -22,9 +22,7 @@
// this define has to be set to split the names into different dll's or so's
// every dll has his own set of property names
#include <rtl/ustring.hxx>
-#ifndef _MAP_
#include <map>
-#endif
#include "connectivity/dbtoolsdllapi.hxx"
namespace dbtools
diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx
index 4578cc5..eafb6df 100644
--- a/dbaccess/source/ui/inc/JoinDesignView.hxx
+++ b/dbaccess/source/ui/inc/JoinDesignView.hxx
@@ -21,9 +21,7 @@
#define DBAUI_JOINDESIGNVIEW_HXX
#include <dbaccess/dataview.hxx>
-#ifndef _VECTOR_
#include <vector>
-#endif
#include "QEnumTypes.hxx"
#include <memory>
diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx
index 0d106bf..7c6dc92 100644
--- a/dbaccess/source/ui/inc/RelationDesignView.hxx
+++ b/dbaccess/source/ui/inc/RelationDesignView.hxx
@@ -21,9 +21,7 @@
#define DBAUI_RELATIONDESIGNVIEW_HXX
#include "JoinDesignView.hxx"
-#ifndef _VECTOR_
#include <vector>
-#endif
#include "QEnumTypes.hxx"
#include "RelationTableView.hxx"
diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx
index 61f2a5e..ac008a1 100644
--- a/dbaccess/source/ui/inc/RtfReader.hxx
+++ b/dbaccess/source/ui/inc/RtfReader.hxx
@@ -19,9 +19,7 @@
#ifndef DBAUI_RTFREADER_HXX
#define DBAUI_RTFREADER_HXX
-#ifndef _VECTOR_
#include <vector>
-#endif
#include <svtools/parrtf.hxx>
#include "DExport.hxx"
#include <tools/stream.hxx>
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index b9bbe02..78ac95c 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -21,15 +21,9 @@
#include "OfficeFilePicker.hxx"
#include "iodlg.hxx"
-#ifndef _LIST_
#include <list>
-#endif
-#ifndef _FUNCTIONAL_
#include <functional>
-#endif
-#ifndef _ALGORITHM_
#include <algorithm>
-#endif
#include <tools/urlobj.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx
index 46ced87..617cd94 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -25,9 +25,7 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/uno/Any.hxx>
-#ifndef _VECTOR_
#include <vector>
-#endif
#include <cppuhelper/weakref.hxx>
#include <comphelper/stl_types.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 827d5c8..43135a4 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -20,9 +20,7 @@
#ifndef _UCBHELPER_PROVIDERHELPER_HXX
#define _UCBHELPER_PROVIDERHELPER_HXX
-#ifndef __LIST__
#include <list>
-#endif
#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
index c10aa5d..95b9275 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
@@ -39,9 +39,7 @@
// this define has to be set to split the names into different dll's or so's
// every dll has his own set of property names
#include <rtl/ustring.hxx>
-#ifndef _MAP_
#include <map>
-#endif
namespace connectivity
{
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 3d8186f..5e7172e 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -24,9 +24,7 @@
*************************************************************************/
-#ifndef __VECTOR__
#include <vector>
-#endif
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
commit 98de5b40c8a3fd4e57477b6d994e3b1472207f71
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 23 07:19:08 2013 +0100
Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii
Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
index a864fbe..357166c 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -21,7 +21,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <tools/wintypes.hxx>
namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 62896ac..70e88d3 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -637,14 +637,14 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
mbOwnBasMgr = true;
OUString aExtension = aInitUrlInetObj.getExtension();
- if( aExtension.compareToAscii( "xlc" ) == COMPARE_EQUAL )
+ if( aExtension == "xlc" )
{
meInitMode = CONTAINER_INIT_FILE;
INetURLObject aLibPathInetObj( aInitUrlInetObj );
aLibPathInetObj.removeSegment();
maLibraryPath = aLibPathInetObj.GetMainURL( INetURLObject::NO_DECODE );
}
- else if( aExtension.compareToAscii( "xlb" ) == COMPARE_EQUAL )
+ else if( aExtension == "xlb" )
{
meInitMode = LIBRARY_INIT_FILE;
uno::Reference< embed::XStorage > xDummyStor;
@@ -1308,7 +1308,7 @@ void SfxLibraryContainer::checkStorageURL( const OUString& aSourceURL,
}
INetURLObject aInetObj( aExpandedSourceURL );
OUString aExtension = aInetObj.getExtension();
- if( aExtension.compareToAscii( "xlb" ) == COMPARE_EQUAL )
+ if( aExtension == "xlb" )
{
// URL to xlb file
aLibInfoFileURL = aExpandedSourceURL;
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 0df51e1..8125ab9 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <vcl/window.hxx>
#include <toolkit/helper/vclunohelper.hxx>
// for SolarMutex
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 7ac81f8..e98c58e 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <utility>
#include <algorithm>
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 943081c..9b0fdc9 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -32,7 +32,7 @@
#include "NumberFormatterWrapper.hxx"
#include "RegressionCurveHelper.hxx"
#include <rtl/math.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <com/sun/star/chart2/XTitle.hpp>
#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx
index 72a7b21..61e6755 100644
--- a/chart2/source/tools/ResId.cxx
+++ b/chart2/source/tools/ResId.cxx
@@ -19,7 +19,6 @@
#include "ResId.hxx"
#include "ResourceManager.hxx"
-#include <tools/string.hxx>
namespace chart
{
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index c2c6507..ef480dd 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -71,8 +71,8 @@ ChartItemPool::ChartItemPool():
ppPoolDefaults[SCHATTR_STAT_CONSTPLUS - SCHATTR_START] = new SvxDoubleItem (0.0, SCHATTR_STAT_CONSTPLUS);
ppPoolDefaults[SCHATTR_STAT_CONSTMINUS - SCHATTR_START] = new SvxDoubleItem (0.0, SCHATTR_STAT_CONSTMINUS);
ppPoolDefaults[SCHATTR_STAT_INDICATE - SCHATTR_START] = new SvxChartIndicateItem (CHINDICATE_NONE, SCHATTR_STAT_INDICATE);
- ppPoolDefaults[SCHATTR_STAT_RANGE_POS - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_POS, String());
- ppPoolDefaults[SCHATTR_STAT_RANGE_NEG - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, String());
+ ppPoolDefaults[SCHATTR_STAT_RANGE_POS - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_POS, OUString());
+ ppPoolDefaults[SCHATTR_STAT_RANGE_NEG - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, OUString());
ppPoolDefaults[SCHATTR_STAT_ERRORBAR_TYPE - SCHATTR_START] = new SfxBoolItem(SCHATTR_STAT_ERRORBAR_TYPE, true);
ppPoolDefaults[SCHATTR_STYLE_DEEP - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_DEEP, 0);
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index d956fde..c2f87a2 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -35,6 +35,7 @@
#include "FDatabaseMetaDataResultSet.hxx"
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/types.hxx>
+#include <tools/string.hxx>
using namespace connectivity::calc;
using namespace connectivity::file;
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index bc2e3da..45aaabd 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -32,6 +32,7 @@
#include <comphelper/extract.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/types.hxx>
+#include <tools/string.hxx>
#include <ucbhelper/content.hxx>
using namespace ::comphelper;
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 7f0c00c..3e26231 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/ucb/UniversalContentBroker.hpp>
#include <com/sun/star/ucb/SortedDynamicResultSetFactory.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <tools/string.hxx>
#include <tools/urlobj.hxx>
#include "file/FDriver.hxx"
#include "file/FTable.hxx"
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index bcaacfa..902304c 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -23,18 +23,16 @@
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include "connectivity/OSubComponent.hxx"
-#ifndef _MAP_
-#include <map>
-#endif
#include "connectivity/CommonTools.hxx"
#include "OTypeInfo.hxx"
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/ucb/XDynamicResultSet.hpp>
#include "connectivity/sqlparse.hxx"
#include "connectivity/sqliterator.hxx"
#include "TConnection.hxx"
#include "file/filedllapi.hxx"
+#include <map>
namespace connectivity
{
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index e29d2fb..b18eb0d 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -41,6 +41,7 @@
#include <comphelper/propertycontainer.hxx>
#include "file/fanalyzer.hxx"
#include <comphelper/broadcasthelper.hxx>
+#include <tools/string.hxx>
#include "TSortIndex.hxx"
#define SQL_COLUMN_NOTFOUND STRING_NOTFOUND
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 1a55181..f554ef0 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -218,16 +218,16 @@ void SvxHyperlinkNewDocTp::FillDocumentList ()
|*
|************************************************************************/
-void SvxHyperlinkNewDocTp::GetCurentItemData ( String& aStrURL, String& aStrName,
+void SvxHyperlinkNewDocTp::GetCurentItemData ( OUString& rStrURL, String& aStrName,
String& aStrIntName, String& aStrFrame,
SvxLinkInsertMode& eMode )
{
// get data from dialog-controls
- aStrURL = maCbbPath.GetText();
+ rStrURL = maCbbPath.GetText();
INetURLObject aURL;
- if ( ImplGetURLObject( aStrURL, maCbbPath.GetBaseURL(), aURL ) )
+ if ( ImplGetURLObject( rStrURL, maCbbPath.GetBaseURL(), aURL ) )
{
- aStrURL = aURL.GetMainURL( INetURLObject::NO_DECODE );
+ rStrURL = aURL.GetMainURL( INetURLObject::NO_DECODE );
}
GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode );
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index d5092b9..a5ab744 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -151,15 +151,15 @@ String SvxHyperlinkDocTp::GetCurrentURL ()
|*
|************************************************************************/
-void SvxHyperlinkDocTp::GetCurentItemData ( String& aStrURL, String& aStrName,
+void SvxHyperlinkDocTp::GetCurentItemData ( OUString& rStrURL, String& aStrName,
String& aStrIntName, String& aStrFrame,
SvxLinkInsertMode& eMode )
{
// get data from standard-fields
- aStrURL = GetCurrentURL();
+ rStrURL = GetCurrentURL();
- if( aStrURL.EqualsIgnoreCaseAscii( sFileScheme ) )
- aStrURL=aEmptyStr;
+ if( rStrURL.equalsIgnoreAsciiCase( sFileScheme ) )
+ rStrURL="";
GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode );
}
@@ -198,8 +198,8 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl)
::sfx2::FileDialogHelper aDlg(
com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0,
GetParent() );
- String aOldURL( GetCurrentURL() );
- if( aOldURL.EqualsIgnoreCaseAscii( sFileScheme, 0, sizeof( sFileScheme ) - 1 ) )
+ OUString aOldURL( GetCurrentURL() );
+ if( aOldURL.startsWithIgnoreAsciiCase( sFileScheme ) )
{
aDlg.SetDisplayDirectory( aOldURL );
}
@@ -234,15 +234,15 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl)
IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl)
{
if ( GetPathType ( maStrURL ) == Type_ExistsFile ||
- maStrURL == aEmptyStr ||
- maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) ||
- maStrURL.SearchAscii( sHash ) == 0 )
+ maStrURL.isEmpty() ||
+ maStrURL.equalsIgnoreAsciiCase( sFileScheme ) ||
+ maStrURL.indexOf( sHash ) == 0 )
{
mpMarkWnd->SetError( LERR_NOERROR );
EnterWait();
- if ( maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) )
+ if ( maStrURL.equalsIgnoreAsciiCase( sFileScheme ) )
mpMarkWnd->RefreshTree ( aEmptyStr );
else
mpMarkWnd->RefreshTree ( maStrURL );
@@ -284,12 +284,12 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl)
IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl)
{
if ( IsMarkWndVisible() && ( GetPathType( maStrURL )==Type_ExistsFile ||
- maStrURL == aEmptyStr ||
- maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) ) )
+ maStrURL.isEmpty() ||
+ maStrURL.equalsIgnoreAsciiCase( sFileScheme ) ) )
{
EnterWait();
- if ( maStrURL.EqualsIgnoreCaseAscii( sFileScheme ) )
+ if ( maStrURL.equalsIgnoreAsciiCase( sFileScheme ) )
mpMarkWnd->RefreshTree ( aEmptyStr );
else
mpMarkWnd->RefreshTree ( maStrURL );
@@ -352,9 +352,9 @@ void SvxHyperlinkDocTp::SetMarkStr ( const String& aStrMark )
|*
|************************************************************************/
-SvxHyperlinkDocTp::EPathType SvxHyperlinkDocTp::GetPathType ( String& aStrPath )
+SvxHyperlinkDocTp::EPathType SvxHyperlinkDocTp::GetPathType ( const OUString& rStrPath )
{
- INetURLObject aURL( aStrPath, INET_PROT_FILE );
+ INetURLObject aURL( rStrPath, INET_PROT_FILE );
if( aURL.HasError() )
return Type_Invalid;
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index ab3786a..bbd51e2 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -171,11 +171,11 @@ void SvxHyperlinkInternetTp::setFTPUser(const String& rUser, const String& rPass
|*
|************************************************************************/
-void SvxHyperlinkInternetTp::GetCurentItemData ( String& aStrURL, String& aStrName,
+void SvxHyperlinkInternetTp::GetCurentItemData ( OUString& rStrURL, String& aStrName,
String& aStrIntName, String& aStrFrame,
SvxLinkInsertMode& eMode )
{
- aStrURL = CreateAbsoluteURL();
+ rStrURL = CreateAbsoluteURL();
GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode );
}
@@ -262,8 +262,8 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, TimeoutHdl_Impl)
IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl)
{
- String aStrLogin ( maEdLogin.GetText() );
- if ( aStrLogin.EqualsIgnoreCaseAscii( sAnonymous ) )
+ OUString aStrLogin ( maEdLogin.GetText() );
+ if ( aStrLogin.equalsIgnoreAsciiCase( sAnonymous ) )
{
maCbAnonymous.Check();
ClickAnonymousHdl_Impl(NULL);
@@ -492,11 +492,11 @@ void SvxHyperlinkInternetTp::SetOnlineMode( sal_Bool /*bEnable*/ )
// State of target-button in subject to the current url-string
// ( Can't display any targets in an document, if there is no
// valid url to a document )
- String aStrCurrentTarget(comphelper::string::stripEnd(maCbbTarget.GetText(), ' '));
+ OUString aStrCurrentTarget(comphelper::string::stripEnd(maCbbTarget.GetText(), ' '));
- if( aStrCurrentTarget == aEmptyStr ||
- aStrCurrentTarget.EqualsIgnoreCaseAscii( sHTTPScheme ) ||
- aStrCurrentTarget.EqualsIgnoreCaseAscii( sHTTPSScheme ) )
+ if( aStrCurrentTarget.isEmpty() ||
+ aStrCurrentTarget.equalsIgnoreAsciiCase( sHTTPScheme ) ||
+ aStrCurrentTarget.equalsIgnoreAsciiCase( sHTTPSScheme ) )
maBtTarget.Enable( sal_False );
else
maBtTarget.Enable( sal_True );
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index d799c6c..ef36989 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -136,11 +136,11 @@ void SvxHyperlinkMailTp::FillDlgFields ( String& aStrURL )
|*
|************************************************************************/
-void SvxHyperlinkMailTp::GetCurentItemData ( String& aStrURL, String& aStrName,
+void SvxHyperlinkMailTp::GetCurentItemData ( OUString& rStrURL, String& aStrName,
String& aStrIntName, String& aStrFrame,
SvxLinkInsertMode& eMode )
{
- aStrURL = CreateAbsoluteURL();
+ rStrURL = CreateAbsoluteURL();
GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode );
}
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 2ede80c..762a581 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -414,12 +414,12 @@ SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable()
return ( (SvxMacroTableDtor*)pHyperlinkItem->GetMacroTbl() );
}
-// try to detect the current protocol that is used in aStrURL
-String SvxHyperlinkTabPageBase::GetSchemeFromURL( String aStrURL )
+// try to detect the current protocol that is used in rStrURL
+OUString SvxHyperlinkTabPageBase::GetSchemeFromURL( const OUString& rStrURL )
{
String aStrScheme;
- INetURLObject aURL( aStrURL );
+ INetURLObject aURL( rStrURL );
INetProtocol aProtocol = aURL.GetProtocol();
// #77696#
@@ -427,23 +427,23 @@ String SvxHyperlinkTabPageBase::GetSchemeFromURL( String aStrURL )
// to detect if an Url is valid or not :-(
if ( aProtocol == INET_PROT_NOT_VALID )
{
- if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTP_SCHEME, 0, 7 ) )
+ if ( rStrURL.startsWithIgnoreAsciiCase( INET_HTTP_SCHEME ) )
{
aStrScheme = OUString( INET_HTTP_SCHEME );
}
- else if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTPS_SCHEME, 0, 8 ) )
+ else if ( rStrURL.startsWithIgnoreAsciiCase( INET_HTTPS_SCHEME ) )
{
aStrScheme = OUString( INET_HTTPS_SCHEME );
}
- else if ( aStrURL.EqualsIgnoreCaseAscii( INET_FTP_SCHEME, 0, 6 ) )
+ else if ( rStrURL.startsWithIgnoreAsciiCase( INET_FTP_SCHEME ) )
{
aStrScheme = OUString( INET_FTP_SCHEME );
}
- else if ( aStrURL.EqualsIgnoreCaseAscii( INET_MAILTO_SCHEME, 0, 7 ) )
+ else if ( rStrURL.startsWithIgnoreAsciiCase( INET_MAILTO_SCHEME ) )
{
aStrScheme = OUString( INET_MAILTO_SCHEME );
}
- else if ( aStrURL.EqualsIgnoreCaseAscii( INET_NEWS_SCHEME, 0, 5 ) )
+ else if ( rStrURL.startsWithIgnoreAsciiCase( INET_NEWS_SCHEME ) )
{
aStrScheme = OUString( INET_NEWS_SCHEME );
}
@@ -492,7 +492,8 @@ void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& rItemSet)
// Fill output-ItemSet
sal_Bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut)
{
- String aStrURL, aStrName, aStrIntName, aStrFrame;
+ OUString aStrURL;
+ String aStrName, aStrIntName, aStrFrame;
SvxLinkInsertMode eMode;
GetCurentItemData ( aStrURL, aStrName, aStrIntName, aStrFrame, eMode);
@@ -563,7 +564,8 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet)
HideMarkWnd ();
// retrieve data of dialog
- String aStrURL, aStrName, aStrIntName, aStrFrame;
+ OUString aStrURL;
+ String aStrName, aStrIntName, aStrFrame;
SvxLinkInsertMode eMode;
GetCurentItemData ( aStrURL, aStrName, aStrIntName, aStrFrame, eMode);
diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index 427c42b..66a68a1 100644
--- a/cui/source/dialogs/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -29,6 +29,8 @@
#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/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 609ef34..c7a29c3 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -22,7 +22,6 @@
#include <vector>
#include <boost/ptr_container/ptr_vector.hpp>
#include <rtl/ustring.hxx>
-#include <tools/string.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XFrame.hpp>
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 61c7386..a04f5ed 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -32,7 +32,7 @@
#include <tools/link.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/stl_types.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
namespace svxform {
class FmSearchConfigItem;
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 63e9b76..9a5c7bf 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -20,13 +20,13 @@
#ifndef SVX_DBREGISTER_HXX
#define SVX_DBREGISTER_HXX
-#include "optpath.hxx"
-#include <tools/string.hxx>
#include <comphelper/stl_types.hxx>
-#include <svl/poolitem.hxx>
-#include "ControlFocusHelper.hxx"
+#include <rtl/ustring.hxx>
#include <sfx2/basedlgs.hxx>
+#include <svl/poolitem.hxx>
#include <svtools/simptabl.hxx>
+#include "optpath.hxx"
+#include "ControlFocusHelper.hxx"
class SvTreeListEntry;
namespace svx
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index 0f5832a..9ae7738 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -48,7 +48,7 @@ private:
protected:
void FillDlgFields ( String& aStrURL );
- void GetCurentItemData ( String& aStrURL, String& aStrName,
+ void GetCurentItemData ( OUString& rStrURL, String& aStrName,
String& aStrIntName, String& aStrFrame,
SvxLinkInsertMode& eMode );
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 786a422..0ef62b2 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -42,7 +42,7 @@ private:
FixedText maFtFullURL;
ImageButton maBtBrowse;
- String maStrURL;
+ OUString maStrURL;
sal_Bool mbMarkWndOpen;
@@ -59,11 +59,11 @@ private:
enum EPathType { Type_Unknown, Type_Invalid,
Type_ExistsFile, Type_File,
Type_ExistsDir, Type_Dir };
- EPathType GetPathType ( String& aStrPath );
+ EPathType GetPathType ( const OUString& rStrPath );
protected:
void FillDlgFields ( String& aStrURL );
- void GetCurentItemData ( String& aStrURL, String& aStrName,
+ void GetCurentItemData ( OUString& rStrURL, String& aStrName,
String& aStrIntName, String& aStrFrame,
SvxLinkInsertMode& eMode );
virtual sal_Bool ShouldOpenMarkWnd () {return mbMarkWndOpen;}
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index c79ead8..419465d 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -74,7 +74,7 @@ private:
protected:
virtual void FillDlgFields ( String& aStrURL );
- virtual void GetCurentItemData ( String& aStrURL, String& aStrName,
+ virtual void GetCurentItemData ( OUString& rStrURL, String& aStrName,
String& aStrIntName, String& aStrFrame,
SvxLinkInsertMode& eMode );
virtual sal_Bool ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );}
diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx
index 9fdb4a5..0cbc6b2 100644
--- a/cui/source/inc/hlmailtp.hxx
+++ b/cui/source/inc/hlmailtp.hxx
@@ -52,7 +52,7 @@ private:
protected:
virtual void FillDlgFields ( String& aStrURL );
- virtual void GetCurentItemData ( String& aStrURL, String& aStrName,
+ virtual void GetCurentItemData ( OUString& rStrURL, String& aStrName,
String& aStrIntName, String& aStrFrame,
SvxLinkInsertMode& eMode );
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 8e80f17..945c104 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -105,7 +105,7 @@ protected:
void InitStdControls ();
virtual void FillStandardDlgFields ( SvxHyperlinkItem* pHyperlinkItem );
virtual void FillDlgFields ( String& aStrURL ) = 0;
- virtual void GetCurentItemData ( String& aStrURL, String& aStrName,
+ virtual void GetCurentItemData ( OUString& rStrURL, String& aStrName,
String& aStrIntName, String& aStrFrame,
SvxLinkInsertMode& eMode ) = 0;
virtual String CreateUiNameFromURL( const String& aStrURL );
@@ -118,7 +118,7 @@ protected:
String aEmptyStr;
- static String GetSchemeFromURL( String aStrURL );
+ static OUString GetSchemeFromURL( const OUString& rStrURL );
inline void DisableClose( sal_Bool _bDisable ) { mbIsCloseDisabled = _bDisable; }
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 73e01e5..84dee69 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -19,15 +19,15 @@
#ifndef _ICCDLG_HXX
#define _ICCDLG_HXX
+#include <rtl/ustring.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svtools/ivctrl.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/image.hxx>
-#include <svtools/ivctrl.hxx>
-#include <svl/itempool.hxx>
-#include <svl/itemset.hxx>
-#include <tools/string.hxx>
#include <vector>
#define CTRLS_OFFSET 3
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 12761d0..57dd1d7 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -21,17 +21,17 @@
//------------------------------------------------------------------------
-#include <vcl/window.hxx>
-#include <tools/color.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <sfx2/tabdlg.hxx>
+#include <svx/langbox.hxx>
+#include <svx/fontlb.hxx>
+#include <tools/color.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/edit.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/field.hxx>
-#include <svx/langbox.hxx>
-#include <svx/fontlb.hxx>
+#include <vcl/window.hxx>
//------------------------------------------------------------------------
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index a8eeed3..03f7a78 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -22,6 +22,7 @@
// 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 4bd0d32..a93f6aa 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -20,9 +20,10 @@
#ifndef _OFFAPP_CONNPOOLSETTINGS_HXX_
#define _OFFAPP_CONNPOOLSETTINGS_HXX_
-#include <tools/string.hxx>
#include <comphelper/stl_types.hxx>
+#include <rtl/ustring.hxx>
#include <svl/poolitem.hxx>
+#include <tools/string.hxx>
//........................................................................
namespace offapp
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 084a171..fede730 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -150,8 +150,8 @@ void _SfxMacroTabPage::EnableButtons()
String sEventMacro;
sEventMacro = ((SvLBoxString*)pE->GetItem( LB_MACROS_ITEMPOS ))->GetText();
- String sScriptURI = mpImpl->pMacroLB->GetSelectedScriptURI();
- mpImpl->pAssignPB->Enable( !mpImpl->bReadOnly && !sScriptURI.EqualsIgnoreCaseAscii( sEventMacro ) );
+ OUString sScriptURI = mpImpl->pMacroLB->GetSelectedScriptURI();
+ mpImpl->pAssignPB->Enable( !mpImpl->bReadOnly && !sScriptURI.equalsIgnoreAsciiCase( sEventMacro ) );
}
else
mpImpl->pAssignPB->Enable( sal_False );
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 38d513f..3037e5e 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -94,12 +94,12 @@ sal_Bool ODbaseIndexDialog::GetTable(const String& _rName, TableInfoListIterator
{
if (m_bCaseSensitiv)
{
- if (_rPosition->aTableName.Equals(_rName))
+ if (_rPosition->aTableName.equals(_rName))
return sal_True;
}
else
{
- if (_rPosition->aTableName.EqualsIgnoreCaseAscii(_rName))
+ if (_rPosition->aTableName.equalsIgnoreAsciiCase(_rName))
return sal_True;
}
}
@@ -127,7 +127,7 @@ OTableIndex ODbaseIndexDialog::implRemoveIndex(const String& _rName, TableIndexL
++aSearch, ++nPos
)
{
- if ( m_bCaseSensitiv ? aSearch->GetIndexFileName().Equals(_rName) : aSearch->GetIndexFileName().EqualsIgnoreCaseAscii(_rName) )
+ if ( m_bCaseSensitiv ? aSearch->GetIndexFileName().equals(_rName) : aSearch->GetIndexFileName().equalsIgnoreAsciiCase(_rName) )
{
aReturn = *aSearch;
@@ -425,12 +425,12 @@ void ODbaseIndexDialog::SetCtrls()
checkButtons();
}
-void OTableInfo::WriteInfFile( const String& rDSN ) const
+void OTableInfo::WriteInfFile( const OUString& rDSN ) const
{
// open INF file
INetURLObject aURL;
aURL.SetSmartProtocol(INET_PROT_FILE);
- String aDsn = rDSN;
+ OUString aDsn = rDSN;
{
SvtPathOptions aPathOptions;
aDsn = aPathOptions.SubstituteVariable(aDsn);
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index 2ee8a04..c9cf1f4 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -36,15 +36,15 @@ namespace dbaui
class OTableIndex
{
private:
- String aIndexFileName;
+ OUString aIndexFileName;
public:
OTableIndex() { }
OTableIndex( const OTableIndex& _rSource) : aIndexFileName(_rSource.aIndexFileName) { }
- OTableIndex( const String& rFileName ) : aIndexFileName( rFileName ) { }
+ OTableIndex( const OUString& rFileName ) : aIndexFileName( rFileName ) { }
- void SetIndexFileName( const String& rFileName ) { aIndexFileName = rFileName; }
- String GetIndexFileName() const { return aIndexFileName; }
+ void SetIndexFileName( const OUString& rFileName ) { aIndexFileName = rFileName; }
+ OUString GetIndexFileName() const { return aIndexFileName; }
};
typedef ::std::list< OTableIndex > TableIndexList;
@@ -58,14 +58,14 @@ class OTableInfo
{
friend class ODbaseIndexDialog;
private:
- String aTableName;
+ OUString aTableName;
TableIndexList aIndexList;
public:
OTableInfo() { }
- OTableInfo( const String& rName ) : aTableName(rName) { }
+ OTableInfo( const OUString& rName ) : aTableName(rName) { }
- void WriteInfFile( const String& rDSN ) const;
+ void WriteInfFile( const OUString& rDSN ) const;
};
typedef ::std::list< OTableInfo > TableInfoList;
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index 51d83a0..6a833b2 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -20,6 +20,7 @@
#define DBAUI_GENERALUNDO_HXX
#include <svl/undo.hxx>
+#include <tools/string.hxx>
#include "moduledbu.hxx"
namespace dbaui
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index a33f4fd..16c4156 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -88,7 +88,7 @@ namespace dbaui
virtual void Command(const CommandEvent& rEvt);
OTableWindow* GetTabWin(){ return m_pTabWin; }
- SvTreeListEntry* GetEntryFromText( const String& rEntryText );
+ SvTreeListEntry* GetEntryFromText( const OUString& rEntryText );
private:
using SvTreeListBox::ExecuteDrop;
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 63a6fca..d343934 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -329,12 +329,12 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
{
case HTML_O_ALIGN:
{
- const String& rOptVal = rOption.GetString();
- if (rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_right ))
+ const OUString& rOptVal = rOption.GetString();
+ if (rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_right ))
eVal = SVX_HOR_JUSTIFY_RIGHT;
- else if (rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_center ))
+ else if (rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_center ))
eVal = SVX_HOR_JUSTIFY_CENTER;
- else if (rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_left ))
+ else if (rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_left ))
eVal = SVX_HOR_JUSTIFY_LEFT;
else
eVal = SVX_HOR_JUSTIFY_STANDARD;
diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx
index 4df0a35..593c6fb 100644
--- a/dbaccess/source/ui/misc/charsets.cxx
+++ b/dbaccess/source/ui/misc/charsets.cxx
@@ -35,7 +35,7 @@ namespace dbaui
{
{
LocalResourceAccess aCharsetStrings( RSC_CHARSETS, RSC_RESOURCE );
- m_aSystemDisplayName = String( ModuleRes( 1 ) );
+ m_aSystemDisplayName = ModuleRes( 1 ).toString();
}
}
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx
index 303efe0..d3058b9 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -25,6 +25,7 @@
#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.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 652a4c3..6f4d854 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -572,7 +572,7 @@ void OSelectionBrowseBox::clearEntryFunctionField(const String& _sFieldName,OTab
{
if ( isFieldNameAsterix( _sFieldName ) && (!_pEntry->isNoneFunction() || _pEntry->IsGroupBy()) )
{
- String sFunctionName;
+ OUString sFunctionName;
GetFunctionName(SQL_TOKEN_COUNT,sFunctionName);
String sOldLocalizedFunctionName = _pEntry->GetFunction();
if ( !sOldLocalizedFunctionName.Equals(sFunctionName) || _pEntry->IsGroupBy() )
@@ -800,7 +800,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef&
// do we have a aggregate function and only a function?
else if ( SQL_ISRULE(pColumnRef,general_set_fct) )
{
- String sLocalizedFunctionName;
+ OUString sLocalizedFunctionName;
if ( GetFunctionName(pColumnRef->getChild(0)->getTokenID(),sLocalizedFunctionName) )
{
String sOldLocalizedFunctionName = aSelEntry->GetFunction();
@@ -1052,9 +1052,9 @@ sal_Bool OSelectionBrowseBox::SaveModified()
sal_uInt16 nPos = m_pFunctionCell->GetSelectEntryPos();
// these functions are only available in CORE
String sFunctionName = m_pFunctionCell->GetEntry(nPos);
- String sGroupFunctionName = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1);
+ OUString sGroupFunctionName = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1);
sal_Bool bGroupBy = sal_False;
- if ( sGroupFunctionName.Equals(sFunctionName) ) // check if the function name is GROUP
+ if ( sGroupFunctionName.equals(sFunctionName) ) // check if the function name is GROUP
{
bGroupBy = sal_True;
@@ -1555,7 +1555,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _n
if ( pEntry->GetFunctionType() & (FKT_AGGREGATE) )
{
- String sFunctionName = pEntry->GetFunction();
+ OUString sFunctionName = pEntry->GetFunction();
if ( GetFunctionName(sal_uInt32(-1),sFunctionName) )
pEntry->SetFunction(sFunctionName);
}
@@ -2211,7 +2211,7 @@ OUString OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
return aText;
}
-sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId,String& rFkt)
+sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId, OUString& rFkt)
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
sal_Bool bErg=sal_True;
@@ -2268,7 +2268,7 @@ sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId,Strin
xub_StrLen i;
for ( i = 0; i < nCount-1; i++) // grouping is not counted
{
- if(rFkt.EqualsIgnoreCaseAscii(m_aFunctionStrings.GetToken(i)))
+ if(rFkt.equalsIgnoreAsciiCase(m_aFunctionStrings.GetToken(i)))
{
rFkt = m_aFunctionStrings.GetToken(i);
break;
@@ -2340,16 +2340,16 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, sal_uInt16 nColId, con
break;
case BROW_FUNCTION_ROW:
{
- String sGroupFunctionName = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1);
+ OUString sGroupFunctionName = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1);
pEntry->SetFunction(strNewText);
// first reset this two member
sal_Int32 nFunctionType = pEntry->GetFunctionType();
nFunctionType &= ~FKT_AGGREGATE;
pEntry->SetFunctionType(nFunctionType);
- if ( pEntry->IsGroupBy() && !sGroupFunctionName.EqualsIgnoreCaseAscii(strNewText) )
+ if ( pEntry->IsGroupBy() && !sGroupFunctionName.equalsIgnoreAsciiCase(strNewText) )
pEntry->SetGroupBy(sal_False);
- if ( sGroupFunctionName.EqualsIgnoreCaseAscii(strNewText) )
+ if ( sGroupFunctionName.equalsIgnoreAsciiCase(strNewText) )
pEntry->SetGroupBy(sal_True);
else if ( strNewText.Len() )
{
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index bce9fce..6cb5ad3 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -226,7 +226,7 @@ namespace dbaui
Rectangle GetInvalidRect( sal_uInt16 nColId );
long GetRealRow(long nRow) const;
long GetBrowseRow(long nRowId) const;
- sal_Bool GetFunctionName(sal_uInt32 _nFunctionTokenId,String& rFkt);
+ sal_Bool GetFunctionName(sal_uInt32 _nFunctionTokenId, OUString& rFkt);
void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow,sal_Bool& _bListAction);
void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow);
OTableFields& getFields() const;
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 6e718ab..5da7356 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -80,7 +80,7 @@ OTableWindowListBox::~OTableWindowListBox()
m_pTabWin = NULL;
}
-SvTreeListEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText )
+SvTreeListEntry* OTableWindowListBox::GetEntryFromText( const OUString& rEntryText )
{
// iterate through the list
SvTreeList* pTreeList = GetModel();
@@ -100,7 +100,7 @@ SvTreeListEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText
}
while( pEntry )
{
- if((bCase ? rEntryText == GetEntryText(pEntry) : rEntryText.EqualsIgnoreCaseAscii(GetEntryText(pEntry))))
+ if((bCase ? rEntryText == GetEntryText(pEntry) : rEntryText.equalsIgnoreAsciiCase(GetEntryText(pEntry))))
{
return pEntry;
}
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 1f6f744..973d3f6 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -42,7 +42,7 @@
using namespace ::com::sun::star;
-static CharSet lcl_GetDefaultTextEncodingForRTF()
+static rtl_TextEncoding lcl_GetDefaultTextEncodingForRTF()
{
OUString aLangString( Application::GetSettings().GetLanguageTag().getLanguage());
@@ -463,7 +463,7 @@ void SvxRTFParser::ReadFontTable()
OUString sAltNm, sFntNm;
sal_Bool bIsAltFntNm = sal_False, bCheckNewFont;
- CharSet nSystemChar = lcl_GetDefaultTextEncodingForRTF();
+ rtl_TextEncoding nSystemChar = lcl_GetDefaultTextEncodingForRTF();
pFont->SetCharSet( nSystemChar );
SetEncoding( nSystemChar );
@@ -516,7 +516,7 @@ void SvxRTFParser::ReadFontTable()
case RTF_FDECOR:
pFont->SetFamily( FAMILY_DECORATIVE );
break;
- // for technical/symbolic font of the CharSet is changed!
+ // for technical/symbolic font of the rtl_TextEncoding is changed!
case RTF_FTECH:
pFont->SetCharSet( RTL_TEXTENCODING_SYMBOL );
// deliberate fall through
@@ -526,14 +526,14 @@ void SvxRTFParser::ReadFontTable()
case RTF_FCHARSET:
if (-1 != nTokenValue)
{
- CharSet nCharSet = rtl_getTextEncodingFromWindowsCharset(
+ rtl_TextEncoding nrtl_TextEncoding = rtl_getTextEncodingFromWindowsCharset(
(sal_uInt8)nTokenValue);
- pFont->SetCharSet(nCharSet);
+ pFont->SetCharSet(nrtl_TextEncoding);
//When we're in a font, the fontname is in the font
//charset, except for symbol fonts I believe
- if (nCharSet == RTL_TEXTENCODING_SYMBOL)
- nCharSet = RTL_TEXTENCODING_DONTKNOW;
- SetEncoding(nCharSet);
+ if (nrtl_TextEncoding == RTL_TEXTENCODING_SYMBOL)
+ nrtl_TextEncoding = RTL_TEXTENCODING_DONTKNOW;
+ SetEncoding(nrtl_TextEncoding);
}
break;
case RTF_FPRQ:
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index b131586..cd52e33 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -44,7 +44,7 @@ void SvxUnoFontDescriptor::ConvertToFont( const awt::FontDescriptor& rDesc, Font
rFont.SetStyleName( rDesc.StyleName );
rFont.SetSize( Size( rDesc.Width, rDesc.Height ) );
rFont.SetFamily( (FontFamily)rDesc.Family );
- rFont.SetCharSet( (CharSet)rDesc.CharSet );
+ rFont.SetCharSet( (rtl_TextEncoding)rDesc.CharSet );
rFont.SetPitch( (FontPitch)rDesc.Pitch );
rFont.SetOrientation( (short)(rDesc.Orientation*10) );
rFont.SetKerning( rDesc.Kerning );
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 668dcc3..dbaa913 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -1500,9 +1500,9 @@ void BibDataManager::SetMeAsUidListener()
OUString theFieldName;
for( sal_Int32 i=0; i<nCount; i++ )
{
- String aName= pFields[i];
+ const OUString& rName = pFields[i];
- if(aName.EqualsIgnoreCaseAscii(StrUID))
+ if (rName.equalsIgnoreAsciiCase(StrUID))
{
theFieldName=pFields[i];
break;
@@ -1544,9 +1544,9 @@ void BibDataManager::RemoveMeAsUidListener()
OUString theFieldName;
for( sal_Int32 i=0; i<nCount; i++ )
{
- String aName= pFields[i];
+ const OUString& rName = pFields[i];
- if(aName.EqualsIgnoreCaseAscii(StrUID))
+ if (rName.equalsIgnoreAsciiCase(StrUID))
{
theFieldName=pFields[i];
break;
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index d8a6473..f254d28 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -874,7 +874,7 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope
for ( sal_uInt16 n=0; n<nCount; n++ )
{
BibStatusDispatch *pObj = &aStatusListeners[n];
- if(COMPARE_EQUAL == pObj->aURL.Path.compareToAscii("Bib/MenuFilter"))
+ if (pObj->aURL.Path == "Bib/MenuFilter")
{
FeatureStateEvent aEvent;
aEvent.FeatureURL = pObj->aURL;
@@ -889,7 +889,7 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope
pObj->xListener->statusChanged( aEvent );
bMenuFilter=sal_True;
}
- else if(COMPARE_EQUAL == pObj->aURL.Path.compareToAscii("Bib/query"))
+ else if (pObj->aURL.Path == "Bib/query")
{
FeatureStateEvent aEvent;
aEvent.FeatureURL = pObj->aURL;
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 50dbebb..dc0a921 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -548,9 +548,9 @@ namespace pcr
if ( xBinding.is() )
{
// find a nice name for it
- String sBaseName(PcrRes(RID_STR_BINDING_UI_NAME).toString());
+ OUString sBaseName(PcrRes(RID_STR_BINDING_UI_NAME).toString());
sBaseName += OUString(" ");
- String sNewName;
+ OUString sNewName;
sal_Int32 nNumber = 1;
do
{
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 9c008cc..08ca0a3 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -24,7 +24,6 @@
#include <cppuhelper/implbase1.hxx>
#include <rtl/ustring.hxx>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
#include <vcl/metric.hxx>
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index 0e1c78f..2db7139 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -19,6 +19,7 @@
#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 71f063b..9716c53 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -58,6 +58,7 @@
#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 d089eef..20689d3 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -31,6 +31,7 @@
#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/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 199a13c..cf8d179 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -156,20 +156,20 @@ namespace
}
//-----------------------------------------------------------------------------
- String GetFsysExtension_Impl( const String& rFile, const String& rLastFilterExt )
+ OUString GetFsysExtension_Impl( const OUString& rFile, const OUString& rLastFilterExt )
{
- xub_StrLen nDotPos = rFile.SearchBackward( '.' );
- if ( nDotPos != STRING_NOTFOUND )
+ sal_Int32 nDotPos = rFile.lastIndexOf( '.' );
+ if ( nDotPos != -1 )
{
- if ( rLastFilterExt.Len() )
+ if ( !rLastFilterExt.isEmpty() )
{
- if ( rFile.Copy( nDotPos + 1 ).EqualsIgnoreCaseAscii( rLastFilterExt ) )
- return String( rLastFilterExt );
+ if ( rFile.copy( nDotPos + 1 ).equalsIgnoreAsciiCase( rLastFilterExt ) )
+ return rLastFilterExt;
}
else
- return String( rFile.Copy( nDotPos ) );
+ return rFile.copy( nDotPos );
}
- return String();
+ return OUString();
}
//-----------------------------------------------------------------------------
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 237c0db..b03c7e9 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -454,7 +454,7 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL&
const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
throw(css::uno::RuntimeException)
{
- SAL_INFO("fwk.autorecovery", "AutoRecovery::dispatch() starts ..." << OUString(aURL.Complete));
+ SAL_INFO("fwk.autorecovery", "AutoRecovery::dispatch() starts ..." << aURL.Complete);
// valid request ?
sal_Int32 eNewJob = AutoRecovery::implst_classifyJob(aURL);
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index d39c90e..af9776e 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1941,7 +1941,6 @@ sal_Bool Desktop::implcp_ctor( const css::uno::Reference< css::uno::XComponentCo
);
}
-//*****************************************************************************************************************
// We work with valid listener only.
sal_Bool Desktop::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
{
@@ -1951,7 +1950,6 @@ sal_Bool Desktop::implcp_addEventListener( const css::uno::Reference< css::lang:
);
}
-//*****************************************************************************************************************
// We work with valid listener only.
sal_Bool Desktop::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
{
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index e0d1388..23f8cc5 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -3255,7 +3255,6 @@ sal_Bool Frame::implcp_windowDeactivated( const css::lang::EventObject& aEvent )
);
}
-//*****************************************************************************************************************
sal_Bool Frame::implcp_disposing( const css::lang::EventObject& aEvent )
{
return (
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index ff9335c..d85ba14 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -66,7 +66,6 @@ using namespace com::sun::star::container;
namespace framework{
-//***********************************************
// XInterface, XTypeProvider, XServiceInfo
DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2(
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 6d7bf4e..5cb09b9 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -422,9 +422,7 @@ TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID
return pIt;
}
-//*****************************************************************************************************************
// TabWindowService
-//*****************************************************************************************************************
FwkTabWindow* TabWindowService::mem_TabWin ()
{
FwkTabWindow* pWin = NULL;
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index b894295..e265e2c 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -330,7 +330,6 @@ void TaskCreatorService::implts_establishTitleBarUpdate( const css::uno::Referen
xInit->initialize(lInitData);
}
-//-----------------------------------------------
OUString TaskCreatorService::impl_filterNames( const OUString& sName )
{
OUString sFiltered;
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 19bca3b..13e42d9 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -325,11 +325,6 @@ OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL
return OUString();
}
-//_________________________________________________________________________________________________________________
-// debug methods
-//_________________________________________________________________________________________________________________
-
-
} // namespace framework
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
index bce450f..359fc0f 100644
--- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
@@ -21,7 +21,7 @@
#include <drawinglayer/drawinglayerdllapi.h>
#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
//////////////////////////////////////////////////////////////////////////////
diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
index 7cf2311..13fb133 100644
--- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
@@ -23,7 +23,7 @@
#include <drawinglayer/drawinglayerdllapi.h>
#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
//////////////////////////////////////////////////////////////////////////////
diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx
index e38086f..06d9068 100644
--- a/include/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -24,7 +24,7 @@
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <vcl/font.hxx>
#include <basegfx/color/bcolor.hxx>
#include <vector>
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index c5c492e..7ec841e 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -20,8 +20,8 @@
#ifndef _SVX_ACCESSIBLE_EDITABLE_TEXT_PARA_HXX
#define _SVX_ACCESSIBLE_EDITABLE_TEXT_PARA_HXX
+#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
-#include <tools/string.hxx>
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/compbase9.hxx>
#include <cppuhelper/typeprovider.hxx>
diff --git a/include/editeng/AccessibleStringWrap.hxx b/include/editeng/AccessibleStringWrap.hxx
index 3252d153..1d0a9a8 100644
--- a/include/editeng/AccessibleStringWrap.hxx
+++ b/include/editeng/AccessibleStringWrap.hxx
@@ -20,10 +20,9 @@
#ifndef _ACCESSIBLESTRINGWRAP_HXX
#define _ACCESSIBLESTRINGWRAP_HXX
-#include <sal/types.h>
-#include <tools/string.hxx>
-
#include <editeng/editengdllapi.h>
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
class OutputDevice;
class SvxFont;
diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx
index 6fc197fb..fef8807 100644
--- a/include/editeng/charsetcoloritem.hxx
+++ b/include/editeng/charsetcoloritem.hxx
@@ -19,9 +19,9 @@
#ifndef _SVX_CSCOITEM_HXX
#define _SVX_CSCOITEM_HXX
-#include <tools/string.hxx>
#include <editeng/colritem.hxx>
#include <editeng/editengdllapi.h>
+#include <rtl/ustring.hxx>
// class SvxCharSetColorItem ---------------------------------------------
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 6ddf0e8..0369c25 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -20,7 +20,7 @@
#ifndef _EDITSTAT_HXX
#define _EDITSTAT_HXX
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <i18nlangtag/lang.h>
#define EE_CNTRL_USECHARATTRIBS 0x00000001 // Use of hard character attributes
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index 8f9c7ab..6f87e07 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -19,8 +19,8 @@
#ifndef _EDT_ABSTDLG_HXX
#define _EDT_ABSTDLG_HXX
+#include <rtl/ustring.hxx>
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <editeng/editengdllapi.h>
#include <i18nlangtag/lang.h>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index e083e86..0536c79 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -19,10 +19,10 @@
#ifndef _SVX_FONTITEM_HXX
#define _SVX_FONTITEM_HXX
+#include <editeng/editengdllapi.h>
+#include <rtl/ustring.hxx>
#include <svl/poolitem.hxx>
-#include <tools/string.hxx>
#include <vcl/font.hxx>
-#include "editeng/editengdllapi.h"
class SvXMLUnitConverter;
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index 8a64415..153a8ff 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -23,7 +23,7 @@
#include <editeng/eerdll.hxx>
// forward ---------------------------------------------------------------
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <tools/resid.hxx>
#include <tools/bigint.hxx>
#include <svl/poolitem.hxx>
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 0ed0a84..d1a9c34 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -19,8 +19,8 @@
#ifndef _SVX_NUMITEM_HXX
#define _SVX_NUMITEM_HXX
+#include <rtl/ustring.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
#include <svl/poolitem.hxx>
#include <editeng/svxenum.hxx>
#include <tools/gen.hxx>
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 3b3f18b..b8f12365 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -19,14 +19,12 @@
#ifndef _OUTLINER_HXX
#define _OUTLINER_HXX
-#include <tools/gen.hxx>
-#include <tools/string.hxx>
-
-#include <svl/brdcst.hxx>
-
#include <editeng/editdata.hxx>
#include <editeng/numitem.hxx>
#include <i18nlangtag/lang.h>
+#include <rtl/ustring.hxx>
+#include <svl/brdcst.hxx>
+#include <tools/gen.hxx>
#include <tools/color.hxx>
#include <tools/contnr.hxx>
#include <vcl/graph.hxx>
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 8aa45c2..64ffdd2 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -22,11 +22,11 @@
//////////////////////////////////////////////////////////////////////////////
-#include <tools/solar.h>
-#include <tools/string.hxx>
-#include <rsc/rscsfx.hxx>
#include <editeng/paragraphdata.hxx>
-#include "editeng/editengdllapi.h"
+#include <editeng/editengdllapi.h>
+#include <rtl/ustring.hxx>
+#include <rsc/rscsfx.hxx>
+#include <tools/solar.h>
class EditTextObject;
class ImplOutlinerParaObject;
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index 41d0753..3a7855f 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -19,10 +19,10 @@
#ifndef _SVX_SPLWRAP_HXX
#define _SVX_SPLWRAP_HXX
+#include <editeng/editengdllapi.h>
#include <editeng/svxenum.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include "editeng/editengdllapi.h"
// forward ---------------------------------------------------------------
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 4a5a83a..856c194 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -20,9 +20,9 @@
#ifndef _SVXRTF_HXX
#define _SVXRTF_HXX
-#include <tools/string.hxx>
#include <svl/itemset.hxx>
#include <svtools/parrtf.hxx>
+#include <rtl/ustring.hxx>
#include <editeng/editengdllapi.h>
diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 74e2163..fecbb4a 100644
--- a/include/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
@@ -20,12 +20,10 @@
#ifndef EE_SVXSWAFOPT_HXX
#define EE_SVXSWAFOPT_HXX
+#include <editeng/editengdllapi.h>
#include <o3tl/sorted_vector.hxx>
-
-#include <tools/string.hxx>
-
+#include <rtl/ustring.hxx>
#include <vcl/font.hxx>
-#include "editeng/editengdllapi.h"
class SmartTagMgr;
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 0a3b691..215785a 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -22,11 +22,11 @@
#include <com/sun/star/accessibility/TextSegment.hpp>
-#include <tools/solar.h>
#include <i18nlangtag/lang.h>
+#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
+#include <tools/solar.h>
#include <vcl/mapmod.hxx>
-#include <tools/string.hxx>
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
#include <svl/itempool.hxx>
diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx
index a1c24c4..c63f502 100644
--- a/include/editeng/unolingu.hxx
+++ b/include/editeng/unolingu.hxx
@@ -21,7 +21,7 @@
#define _UNO_LINGU_HXX
#include <i18nlangtag/lang.h>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <com/sun/star/util/Language.hpp>
#include <com/sun/star/linguistic2/XLinguServiceManager2.hpp>
#include <com/sun/star/linguistic2/XLinguProperties.hpp>
diff --git a/include/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx
index d543ac3..dab61f8 100644
--- a/include/filter/msfilter/rtfutil.hxx
+++ b/include/filter/msfilter/rtfutil.hxx
@@ -10,10 +10,11 @@
#ifndef INCLUDED_MSFILTER_RTFUTIL_HXX
#define INCLUDED_MSFILTER_RTFUTIL_HXX
-#include "filter/msfilter/msfilterdllapi.h"
+#include <filter/msfilter/msfilterdllapi.h>
#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
#include <rtl/textenc.h>
-#include <tools/string.hxx>
+#include <tools/solar.h>
namespace msfilter {
namespace rtfutil {
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 4cba0ec..0f5c6b3 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -20,8 +20,8 @@
#ifndef _SVDFPPT_HXX
#define _SVDFPPT_HXX
+#include <rtl/ustring.hxx>
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <tools/gen.hxx>
#include <tools/color.hxx>
#include <svx/svdobj.hxx>
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index c1e94da..963ca1b 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -20,10 +20,10 @@
#ifndef FORMULA_COMPILER_HXX_INCLUDED
#define FORMULA_COMPILER_HXX_INCLUDED
-#include "formula/formuladllapi.h"
-#include <tools/string.hxx>
-#include <tools/debug.hxx>
+#include <formula/formuladllapi.h>
#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/debug.hxx>
#include <boost/shared_ptr.hpp>
#include <boost/unordered_map.hpp>
@@ -34,7 +34,7 @@
#include "formula/grammar.hxx"
#include "formula/token.hxx"
#include "formula/ExternalReferenceHelper.hxx"
-
+#include <tools/string.hxx>
#define FORMULA_MAXJUMPCOUNT 32 /* maximum number of jumps (ocChose) */
#define FORMULA_MAXTOKENS 8192 /* maximum number of tokens in formula */
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index c5d3919..d8182a9 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -24,7 +24,7 @@
#include <memory>
#include "formula/formuladllapi.h"
#include <rtl/ustring.hxx>
-#include <tools/string.hxx>
+#include <tools/solar.h>
#include <com/sun/star/sheet/XFormulaParser.hpp>
#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx
index d7d60b55..536521a 100644
--- a/include/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
@@ -20,9 +20,9 @@
#ifndef FORMULA_FORMDATA_HXX
#define FORMULA_FORMDATA_HXX
-#include <tools/string.hxx>
+#include <formula/formuladllapi.h>
+#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
-#include "formula/formuladllapi.h"
//============================================================================
namespace formula
diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx
index c717dd4..41095da9 100644
--- a/include/formula/formulahelper.hxx
+++ b/include/formula/formulahelper.hxx
@@ -20,11 +20,11 @@
#ifndef FORMULA_FORMULA_HELPER_HXX
#define FORMULA_FORMULA_HELPER_HXX
-#include "formula/IFunctionDescription.hxx"
+#include <formula/IFunctionDescription.hxx>
+#include <formula/formuladllapi.h>
+#include <rtl/ustring.hxx>
#include <vector>
-#include <tools/string.hxx>
#include <memory>
-#include "formula/formuladllapi.h"
class SvtSysLocale;
class CharClass;
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index da5c4dc..546ab57 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -35,7 +35,7 @@
#include <cppuhelper/implbase1.hxx> // helper for implementations
#include <unotools/pathoptions.hxx>
#include <i18nlangtag/lang.h>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <unotools/charclass.hxx>
#include <osl/thread.h>
#include <osl/mutex.hxx>
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index d9ab7f1..917cc2c 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -35,14 +35,12 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <cppuhelper/weak.hxx>
+#include <rtl/ustring.hxx>
+#include <svl/lstner.hxx>
#include <tools/link.hxx>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
-#include <svl/lstner.hxx>
-
-#include <cppuhelper/weak.hxx>
#include <ucbhelper/content.hxx>
-
#include <vector>
class SvKeyValueIterator;
@@ -78,17 +76,6 @@ public:
StreamMode nOpenMode,
const SfxFilter *pFilter = 0,
SfxItemSet *pSet = 0 );
- //TODO: the next, non-defined overload is only there to
- // detect uses of the above (String, StreamMode, etc.)
- // overload from when it still had an additional third
- // parameter sal_Bool bDirect, where now a leftover
- // "false" or "sal_False" could be mistaken for a null
- // pointer argument for the pFilter parameter; it can be
- // removed once we are confident all old uses of the
- // original overload have been adapted (in platform
- // specific code etc.):
- SfxMedium(String const &, StreamMode, void *)
- SAL_DELETED_FUNCTION;
/**
* @param pSet does NOT take ownership
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index bd2d41e..2470155 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -19,23 +19,22 @@
#ifndef _SFX_DOCFILT_HACK_HXX
#define _SFX_DOCFILT_HACK_HXX
-#include <sal/config.h>
-#include <sfx2/dllapi.h>
-#include <sal/types.h>
-#include <tools/solar.h>
-#include <tools/string.hxx>
#include <com/sun/star/plugin/PluginDescription.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
#include <com/sun/star/lang/WrappedTargetException.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
+#include <comphelper/documentconstants.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
+#include <sfx2/sfxdefs.hxx>
+#include <tools/solar.h>
#include <tools/wldcrd.hxx>
-#include <comphelper/documentconstants.hxx>
#define SFX_FILTER_STARTPRESENTATION 0x20000000L
-#include <sfx2/sfxdefs.hxx>
-
class SfxFilterContainer;
class SotStorage;
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx
index beee0af..414991d 100644
--- a/include/sfx2/docinsert.hxx
+++ b/include/sfx2/docinsert.hxx
@@ -20,13 +20,12 @@
#ifndef _SFX_DOCINSERT_HXX
#define _SFX_DOCINSERT_HXX
+#include <rtl/ustring.hxx>
+#include <sfx2/dllapi.h>
#include <tools/errcode.hxx>
#include <tools/link.hxx>
-#include <tools/string.hxx>
#include <vector>
-#include "sfx2/dllapi.h"
-
namespace sfx2 { class FileDialogHelper; }
class SfxMedium;
class SfxItemSet;
diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx
index f79a4b5..cc3fc4e 100644
--- a/include/sfx2/doctempl.hxx
+++ b/include/sfx2/doctempl.hxx
@@ -19,11 +19,11 @@
#ifndef _SFXDOCTEMPL_HXX
#define _SFXDOCTEMPL_HXX
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
#include <tools/ref.hxx>
-#include <tools/string.hxx>
// CLASS -----------------------------------------------------------------
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index 67fbc84..f178a40 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -22,7 +22,6 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
#include "sfx2/sfx.hrc"
-#include <tools/string.hxx>
#include <svl/hint.hxx>
#include <unotools/eventcfg.hxx>
#include <rtl/ustring.hxx>
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index b294416..163eef9 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -26,7 +26,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <tools/errcode.hxx>
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 7bff403..510f79b 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -54,11 +54,12 @@ namespace com
}
}
}
-#include <tools/ref.hxx>
-#include <tools/string.hxx>
+
+#include <comphelper/namedvaluecollection.hxx>
+#include <rtl/ustring.hxx>
#include <svl/brdcst.hxx>
#include <svl/poolitem.hxx>
-#include <comphelper/namedvaluecollection.hxx>
+#include <tools/ref.hxx>
#include <vector>
class SvBorder;
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index dae8939..7837849 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -19,14 +19,13 @@
#ifndef _SFX_FRMDESCRHXX
#define _SFX_FRMDESCRHXX
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
#include <sfx2/sfxsids.hrc>
#include <svl/poolitem.hxx>
-#include <tools/urlobj.hxx>
-#include <tools/string.hxx>
#include <tools/gen.hxx>
+#include <tools/urlobj.hxx>
class SvStream;
struct SfxFrameDescriptor_Impl;
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index f8ddc88..909a5ae 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -19,13 +19,12 @@
#ifndef _LINKMGR_HXX
#define _LINKMGR_HXX
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
#include <sfx2/linksrc.hxx>
-#include <tools/string.hxx>
-
-#include <vector>
#include <set>
+#include <vector>
class SfxObjectShell;
class Graphic;
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 5b8d1b1..71ccb16 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -20,12 +20,12 @@
#define _LNKBASE_HXX
#include <com/sun/star/io/XInputStream.hpp>
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
+#include <sfx2/linksrc.hxx>
#include <sot/exchange.hxx>
#include <tools/ref.hxx>
-#include <tools/string.hxx>
-#include <sfx2/linksrc.hxx>
namespace com { namespace sun { namespace star { namespace uno
{
diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index 87f3d09..ff89a4d 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
@@ -19,12 +19,12 @@
#ifndef INCLUDED_SFX_MAILMODEL_HXX
#define INCLUDED_SFX_MAILMODEL_HXX
-#include <vector>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XModel.hpp>
-#include "tools/link.hxx"
-#include <tools/string.hxx>
-#include "sfx2/dllapi.h"
+#include <rtl/ustring.hxx>
+#include <sfx2/dllapi.h>
+#include <tools/link.hxx>
+#include <vector>
// class AddressList_Impl ------------------------------------------------
typedef ::std::vector< OUString > AddressList_Impl;
diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx
index 1e70ae9..e324946 100644
--- a/include/sfx2/mieclip.hxx
+++ b/include/sfx2/mieclip.hxx
@@ -20,11 +20,11 @@
#ifndef _MIECLIP_HXX
#define _MIECLIP_HXX
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
#include <tools/solar.h>
-#include <tools/string.hxx>
class SvStream;
class SotDataObject;
diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index f08bb68..4178076 100644
--- a/include/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.hxx
@@ -19,10 +19,11 @@
#ifndef _SFX_MINFITEM_HXX
#define _SFX_MINFITEM_HXX
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
#include <svl/poolitem.hxx>
+
class BasicManager;
class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem
diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx
index c2b7d2b3..5fa5321 100644
--- a/include/sfx2/mnuitem.hxx
+++ b/include/sfx2/mnuitem.hxx
@@ -19,8 +19,12 @@
#ifndef _SFXMNUITEM_HXX
#define _SFXMNUITEM_HXX
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/ctrlitem.hxx>
+#include <sfx2/dllapi.h>
class SfxVirtualMenu;
class SfxBindings;
@@ -30,11 +34,6 @@ class PopupMenu;
class SfxUnoMenuControl;
class SfxUnoControllerItem;
struct SfxMenuCtrlFactory;
-#include <tools/string.hxx>
-#include <sfx2/ctrlitem.hxx>
-
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/util/URL.hpp>
class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem
{
diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx
index 891bcac..9f0a4eb 100644
--- a/include/sfx2/msgpool.hxx
+++ b/include/sfx2/msgpool.hxx
@@ -19,13 +19,11 @@
#ifndef _SFXMSGPOOL_HXX
#define _SFXMSGPOOL_HXX
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
-
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
#include <sfx2/msg.hxx>
-#include <tools/string.hxx>
-
#include <string>
#include <vector>
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 3a0a81b..f852a00 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -19,15 +19,12 @@
#ifndef _SFXOBJFACE_HXX
#define _SFXOBJFACE_HXX
-#include "sal/config.h"
-
-#include "rtl/ustring.hxx"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
-#include <tools/string.hxx>
-#include <tools/resid.hxx>
-
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
#include <sfx2/msg.hxx>
+#include <tools/resid.hxx>
struct SfxFormalArgument;
struct SfxInterface_Impl;
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index a3e059b..b5455a8 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -19,17 +19,15 @@
#ifndef _SFX_SHELL_HXX
#define _SFX_SHELL_HXX
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
#include <com/sun/star/embed/VerbDescriptor.hpp>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
+#include <sfx2/sfxuno.hxx>
+#include <svl/brdcst.hxx>
#include <tools/debug.hxx>
#include <tools/rtti.hxx>
-#include <svl/brdcst.hxx>
-
-#include <tools/string.hxx>
-
-#include <sfx2/sfxuno.hxx>
class ResMgr;
class Window;
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index 67beb33..6991530 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -19,13 +19,12 @@
#ifndef _SFX_STYFITEM_HXX
#define _SFX_STYFITEM_HXX
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
#include <vcl/bitmap.hxx>
#include <vcl/image.hxx>
#include <tools/rc.hxx>
-#include <tools/string.hxx>
#include <rsc/rscsfx.hxx>
#include <vector>
diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx
index 9327803..30fa06e 100644
--- a/include/sfx2/tplpitem.hxx
+++ b/include/sfx2/tplpitem.hxx
@@ -19,12 +19,12 @@
#ifndef _SFX_TPLPITEM_HXX
#define _SFX_TPLPITEM_HXX
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include <tools/string.hxx>
-#include <tools/rtti.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
#include <svl/flagitem.hxx>
#include <svl/style.hrc>
+#include <tools/rtti.hxx>
class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem
{
diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx
index 7ff4572..a4184c1 100644
--- a/include/sfx2/viewfac.hxx
+++ b/include/sfx2/viewfac.hxx
@@ -19,9 +19,9 @@
#ifndef _VIEWFAC_HXX
#define _VIEWFAC_HXX
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
#include <tools/resid.hxx>
class SfxViewFrame;
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 4fba3e3..4ce510a 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -20,12 +20,11 @@
#ifndef _SFXITEMPOOL_HXX
#define _SFXITEMPOOL_HXX
-#include "svl/svldllapi.h"
-
#include <limits.h>
-#include <tools/solar.h>
-#include <tools/string.hxx>
+#include <rtl/string.hxx>
#include <svl/poolitem.hxx>
+#include <svl/svldllapi.h>
+#include <tools/solar.h>
#include <vector>
class SvStream;
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 85e006e..c6c218a 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -21,11 +21,11 @@
// class SvxMacroItem ----------------------------------------------------
-#include "svl/svldllapi.h"
+#include <rtl/ustring.hxx>
+#include <svl/svldllapi.h>
#include <svl/poolitem.hxx>
#include <tools/rtti.hxx>
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <map>
class SvStream;
diff --git a/include/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx
index fdedea0..5ed3fbf 100644
--- a/include/svl/nfkeytab.hxx
+++ b/include/svl/nfkeytab.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVTOOLS_NFKEYTAB_HXX
#include <vector>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
//! For ImpSvNumberformatScan: first the short symbols, then the long symbols!
//! e.g. first TT then TTTT
@@ -34,7 +34,7 @@
// Note: 2005-09-02: the above applies to the binary file format.
//
// ER 15.12.99: This table is externally only to be used with method
-// String SvNumberformat::GetMappedFormatstring( const NfKeywordTable&, const LocaleDataWrapper& );
+// OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable&, const LocaleDataWrapper& );
// and method
// void SvNumberFormatter::FillKeywordTable( NfKeywordTable&, LanguageType );
enum NfKeywordIndex
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index b16775f..80820c5 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -19,9 +19,9 @@
#ifndef _UNDO_HXX
#define _UNDO_HXX
-#include "svl/svldllapi.h"
+#include <svl/svldllapi.h>
+#include <rtl/ustring.hxx>
#include <tools/rtti.hxx>
-#include <tools/string.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/include/svl/urlbmk.hxx b/include/svl/urlbmk.hxx
index 672a9ec..89d02cb 100644
--- a/include/svl/urlbmk.hxx
+++ b/include/svl/urlbmk.hxx
@@ -20,8 +20,7 @@
#ifndef _URLBMK_HXX
#define _URLBMK_HXX
-
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
//=========================================================================
diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx
index e7d9ddc..34002b3 100644
--- a/include/svx/ParseContext.hxx
+++ b/include/svx/ParseContext.hxx
@@ -19,12 +19,10 @@
#ifndef SVX_QUERYDESIGNCONTEXT_HXX
#define SVX_QUERYDESIGNCONTEXT_HXX
-#include "svx/svxdllapi.h"
#include <connectivity/IParseContext.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
#include <unotools/localedatawrapper.hxx>
-
-
#include <vector>
namespace svxform
diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx
index 98ddfc9..9b56476 100644
--- a/include/svx/XPropertyEntry.hxx
+++ b/include/svx/XPropertyEntry.hxx
@@ -19,8 +19,8 @@
#ifndef _XPROPERTYENTRY_HXX
#define _XPROPERTYENTRY_HXX
+#include <rtl/ustring.hxx>
#include <svx/svxdllapi.h>
-#include <tools/string.hxx>
#include <vcl/bitmap.hxx>
// ---------------------
diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx
index 5edd213..ab9b844 100644
--- a/include/svx/fmsearch.hxx
+++ b/include/svx/fmsearch.hxx
@@ -21,16 +21,16 @@
#define _FMSEARCH_HXX
#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <vcl/dialog.hxx>
+#include <comphelper/stl_types.hxx>
+#include <comphelper/uno3.hxx>
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/edit.hxx>
#include <vcl/combobox.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
namespace com { namespace sun { namespace star {
namespace util {
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index e277f05..be886bc 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -20,10 +20,10 @@
#ifndef _SVX_GALLERY1_HXX_
#define _SVX_GALLERY1_HXX_
-#include <tools/string.hxx>
-#include <tools/urlobj.hxx>
+#include <rtl/ustring.hxx>
#include <svl/brdcst.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
+#include <tools/urlobj.hxx>
#include <cstdio>
#include <vector>
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index c6e5ce4..70efc19 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -19,11 +19,11 @@
#ifndef _SVX_HLNKITEM_HXX
#define _SVX_HLNKITEM_HXX
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <svl/poolitem.hxx>
#include <sfx2/sfxsids.hrc>
#include <svl/macitem.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
#define HYPERDLG_EVENT_MOUSEOVER_OBJECT 0x0001
#define HYPERDLG_EVENT_MOUSECLICK_OBJECT 0x0002
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index ee96b09..3ee4a84 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -22,6 +22,7 @@
#include <boost/shared_ptr.hpp>
#include <vector>
#include <editeng/numitem.hxx>
+#include <tools/string.hxx>
#include <vcl/font.hxx>
namespace svx { namespace sidebar {
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index 00fa70f..4161127 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -20,7 +20,6 @@
#define _SVX_PAGEITEM_HXX
#include <svl/poolitem.hxx>
-#include <tools/string.hxx>
#include "svx/svxdllapi.h"
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index eec572e..11adda2 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -20,12 +20,11 @@
#ifndef _SVDETC_HXX
#define _SVDETC_HXX
-#include <tools/string.hxx>
-
-#include <vcl/outdev.hxx>
-#include <tools/shl.hxx>
+#include <rtl/ustring.hxx>
#include <editeng/outliner.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
+#include <tools/shl.hxx>
+#include <vcl/outdev.hxx>
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/include/svx/svdglob.hxx b/include/svx/svdglob.hxx
index 655fd60..a028e9f 100644
--- a/include/svx/svdglob.hxx
+++ b/include/svx/svdglob.hxx
@@ -20,9 +20,8 @@
#ifndef _SVDGLOB_HXX
#define _SVDGLOB_HXX
+#include <rtl/ustring.hxx>
#include <sal/config.h>
-#include <tools/string.hxx>
-
#include <svx/svxdllapi.h>
//************************************************************
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index faeae35..d6e2afb 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -20,13 +20,13 @@
#ifndef _SVDMARK_HXX
#define _SVDMARK_HXX
-#include <vector>
-
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
#include <svx/sdrobjectuser.hxx>
+#include <tools/solar.h>
#include <set>
+#include <vector>
class Rectangle;
class SdrPage;
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index e3f4f28..c8ed6c2 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -22,12 +22,12 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <cppuhelper/weakref.hxx>
+#include <rtl/ustring.hxx>
#include <sot/storage.hxx>
#include <tools/link.hxx>
#include <tools/weakbase.hxx>
#include <vcl/mapmod.hxx>
#include <svl/brdcst.hxx>
-#include <tools/string.hxx>
#include <tools/datetime.hxx>
#include <svl/hint.hxx>
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index b0c6232..18660b7 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -22,24 +22,24 @@
#include <memory>
#include <typeinfo>
-#include <cppuhelper/weakref.hxx>
-#include <vcl/mapmod.hxx>
-#include <tools/string.hxx>
-#include <tools/weakbase.hxx>
#include <com/sun/star/uno/Any.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <rtl/ustring.hxx>
#include <svl/lstner.hxx>
-#include <vcl/timer.hxx>
+#include <svl/poolitem.hxx>
#include <svx/svdsob.hxx>
#include <svx/svdtypes.hxx> // fuer SdrLayerID
#include <svx/svdglue.hxx> // Klebepunkte
#include <svx/xdash.hxx>
#include <svx/xpoly.hxx>
#include <svx/xenum.hxx>
-#include <vcl/bitmapex.hxx>
#include <svx/sdrobjectuser.hxx>
-#include "svx/svxdllapi.h"
-#include "svx/shapeproperty.hxx"
-#include <svl/poolitem.hxx>
+#include <svx/svxdllapi.h>
+#include <svx/shapeproperty.hxx>
+#include <tools/weakbase.hxx>
+#include <vcl/bitmapex.hxx>
+#include <vcl/mapmod.hxx>
+#include <vcl/timer.hxx>
#include <boost/optional.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 8b11872..a3fba13 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -21,13 +21,13 @@
#define _SVDPAGV_HXX
#include <com/sun/star/awt/XControlContainer.hpp>
-#include <tools/string.hxx>
+#include <cppuhelper/implbase4.hxx>
+#include <rtl/ustring.hxx>
#include <svl/lstner.hxx>
#include <svx/svdhlpln.hxx>
-#include <cppuhelper/implbase4.hxx>
#include <svx/svdsob.hxx>
#include <svx/svdtypes.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
#include <cppuhelper/implbase3.hxx>
#include <vector>
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index c86fd0d..ad96987 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -20,15 +20,13 @@
#ifndef _SVDTRANS_HXX
#define _SVDTRANS_HXX
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
+#include <tools/fract.hxx>
#include <tools/gen.hxx>
#include <tools/poly.hxx>
-#include <tools/fract.hxx>
-
-#include <vcl/mapmod.hxx>
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
-
#include <vcl/field.hxx>
+#include <vcl/mapmod.hxx>
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/include/svx/swframeposstrings.hxx b/include/svx/swframeposstrings.hxx
index 7b9b7f2..84ef1d2 100644
--- a/include/svx/swframeposstrings.hxx
+++ b/include/svx/swframeposstrings.hxx
@@ -19,8 +19,8 @@
#ifndef _SVXSWFRAMEPOSSTRINGS_HXX
#define _SVXSWFRAMEPOSSTRINGS_HXX
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
/*
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list