[Libreoffice-commits] .: 14 commits - cui/source editeng/inc editeng/source fpicker/source o3tl/inc sc/source sfx2/inc sfx2/source svl/Package_inc.mk svl/inc svl/source svtools/source svx/inc svx/source svx/workben sw/inc sw/source xmloff/source
Michael Stahl
mst at kemper.freedesktop.org
Wed Jul 25 05:16:22 PDT 2012
cui/source/customize/cfgutil.cxx | 1
cui/source/customize/macropg.cxx | 1
cui/source/customize/selector.cxx | 1
cui/source/dialogs/insdlg.cxx | 1
cui/source/dialogs/linkdlg.cxx | 1
cui/source/inc/acccfg.hxx | 1
cui/source/inc/autocdlg.hxx | 4 -
cui/source/inc/cfgutil.hxx | 1
cui/source/inc/cuifmsearch.hxx | 1
cui/source/inc/cuisrchdlg.hxx | 1
cui/source/tabpages/autocdlg.cxx | 85 ++++++++++++++-----------
cui/source/tabpages/macroass.cxx | 1
cui/source/tabpages/numfmt.cxx | 1
editeng/inc/editeng/svxacorr.hxx | 22 +++++-
editeng/inc/editeng/swafopt.hxx | 44 +++++++++++-
editeng/source/misc/SvXMLAutoCorrectExport.cxx | 3
editeng/source/misc/SvXMLAutoCorrectImport.cxx | 3
editeng/source/misc/svxacorr.cxx | 43 ++++++------
editeng/source/misc/swafopt.cxx | 4 -
fpicker/source/odma/ODMAFolderPicker.cxx | 1
fpicker/source/office/OfficeFilePicker.cxx | 1
fpicker/source/office/OfficeFolderPicker.cxx | 1
fpicker/source/office/iodlg.cxx | 1
fpicker/source/office/iodlgimp.cxx | 1
o3tl/inc/o3tl/sorted_vector.hxx | 12 +++
sc/source/core/data/documen8.cxx | 1
sc/source/filter/excel/excrecds.cxx | 1
sc/source/filter/html/htmlexp.cxx | 1
sc/source/ui/view/viewfun2.cxx | 1
sfx2/inc/sfx2/appuno.hxx | 1
sfx2/source/appl/app.cxx | 1
sfx2/source/appl/appopen.cxx | 1
sfx2/source/appl/linkmgr2.cxx | 1
sfx2/source/appl/sfxhelp.cxx | 1
sfx2/source/dialog/filedlgimpl.hxx | 1
sfx2/source/dialog/templdlg.cxx | 1
sfx2/source/dialog/versdlg.cxx | 1
sfx2/source/doc/docfile.cxx | 1
sfx2/source/doc/docinsert.cxx | 1
sfx2/source/doc/docvor.cxx | 1
sfx2/source/menu/mnumgr.cxx | 1
svl/Package_inc.mk | 1
svl/inc/svl/svstdarr.hxx | 45 -------------
svl/source/items/style.cxx | 1
svl/source/memtools/svarray.cxx | 50 --------------
svl/source/numbers/zforlist.cxx | 1
svtools/source/control/inettbc.cxx | 1
svtools/source/svrtf/svparser.cxx | 1
svx/inc/svx/fmsearch.hxx | 1
svx/inc/svx/fmtools.hxx | 1
svx/inc/svx/numfmtsh.hxx | 1
svx/inc/svx/srchdlg.hxx | 1
svx/source/dialog/fntctrl.cxx | 4 -
svx/source/fmcomp/fmgridcl.cxx | 1
svx/source/form/fmexch.cxx | 1
svx/source/inc/fmshimp.hxx | 1
svx/source/items/clipfmtitem.cxx | 1
svx/source/items/numfmtsh.cxx | 12 +--
svx/workben/edittest.cxx | 13 +++
sw/inc/acmplwrd.hxx | 20 +++--
sw/inc/authfld.hxx | 1
sw/inc/doc.hxx | 1
sw/inc/docstyle.hxx | 1
sw/inc/expfld.hxx | 22 ++++--
sw/inc/ftnidx.hxx | 2
sw/inc/ndarr.hxx | 13 +++
sw/inc/shellres.hxx | 1
sw/inc/swtable.hxx | 5 -
sw/inc/tblsel.hxx | 1
sw/source/core/bastyp/swcache.cxx | 1
sw/source/core/crsr/crstrvl.cxx | 12 +--
sw/source/core/doc/SwStyleNameMapper.cxx | 1
sw/source/core/doc/acmplwrd.cxx | 85 +++++++++++++------------
sw/source/core/doc/dbgoutsw.cxx | 2
sw/source/core/doc/doc.cxx | 8 +-
sw/source/core/doc/docdde.cxx | 4 -
sw/source/core/doc/docfld.cxx | 2
sw/source/core/doc/docglbl.cxx | 26 +++----
sw/source/core/doc/doclay.cxx | 2
sw/source/core/doc/docnew.cxx | 4 -
sw/source/core/doc/docnum.cxx | 18 ++---
sw/source/core/doc/doctxm.cxx | 3
sw/source/core/doc/ftnidx.cxx | 10 +-
sw/source/core/doc/tblcpy.cxx | 4 -
sw/source/core/doc/tblrwcl.cxx | 52 ++++++---------
sw/source/core/docnode/ndcopy.cxx | 2
sw/source/core/docnode/ndnum.cxx | 63 +++---------------
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 28 ++++----
sw/source/core/docnode/node.cxx | 6 -
sw/source/core/docnode/nodes.cxx | 22 +++---
sw/source/core/edit/edattr.cxx | 3
sw/source/core/edit/edglss.cxx | 2
sw/source/core/edit/ednumber.cxx | 2
sw/source/core/edit/edtab.cxx | 1
sw/source/core/fields/authfld.cxx | 1
sw/source/core/fields/cellfml.cxx | 32 ++++-----
sw/source/core/fields/ddetbl.cxx | 14 +---
sw/source/core/fields/expfld.cxx | 21 ++----
sw/source/core/fields/fldlst.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 2
sw/source/core/frmedt/fetab.cxx | 4 -
sw/source/core/inc/UndoCore.hxx | 8 +-
sw/source/core/inc/scriptinfo.hxx | 8 +-
sw/source/core/inc/swcache.hxx | 3
sw/source/core/layout/layhelp.hxx | 9 +-
sw/source/core/table/swtable.cxx | 22 ++----
sw/source/core/text/itratr.hxx | 1
sw/source/core/txtnode/atrftn.cxx | 1
sw/source/core/txtnode/ndtxt.cxx | 1
sw/source/core/undo/undobj.cxx | 38 ++++++-----
sw/source/core/undo/unredln.cxx | 4 -
sw/source/core/undo/untbl.cxx | 23 +++---
sw/source/core/unocore/swunohelper.cxx | 2
sw/source/core/unocore/unocrsrhelper.cxx | 1
sw/source/core/unocore/unofield.cxx | 1
sw/source/core/unocore/unoobj.cxx | 1
sw/source/core/unocore/unoobj2.cxx | 1
sw/source/core/unocore/unoparagraph.cxx | 1
sw/source/core/unocore/unotbl.cxx | 22 +++---
sw/source/filter/ascii/ascatr.cxx | 1
sw/source/filter/basflt/fltini.cxx | 5 -
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/html/htmlbas.cxx | 1
sw/source/filter/html/htmlfly.cxx | 2
sw/source/filter/html/htmlplug.cxx | 1
sw/source/filter/html/htmltab.cxx | 2
sw/source/filter/html/swhtml.hxx | 3
sw/source/filter/rtf/rtftbl.cxx | 6 -
sw/source/filter/ww8/wrtw8esh.cxx | 1
sw/source/filter/xml/xmltbli.hxx | 1
sw/source/filter/xml/xmltexte.cxx | 1
sw/source/ui/app/apphdl.cxx | 1
sw/source/ui/app/appopt.cxx | 1
sw/source/ui/app/docsh.cxx | 2
sw/source/ui/app/docsh2.cxx | 15 ++--
sw/source/ui/chrdlg/drpcps.cxx | 1
sw/source/ui/chrdlg/pardlg.cxx | 1
sw/source/ui/config/optpage.cxx | 1
sw/source/ui/dbui/dbmgr.cxx | 1
sw/source/ui/dbui/mmconfigitem.cxx | 1
sw/source/ui/dialog/macassgn.cxx | 1
sw/source/ui/fldui/fldref.cxx | 3
sw/source/ui/fmtui/tmpdlg.cxx | 1
sw/source/ui/inc/basesh.hxx | 1
sw/source/ui/inc/edtwin.hxx | 1
sw/source/ui/inc/fldmgr.hxx | 1
sw/source/ui/inc/label.hxx | 1
sw/source/ui/inc/redlndlg.hxx | 1
sw/source/ui/index/idxmrk.cxx | 1
sw/source/ui/index/swuiidxmrk.cxx | 1
sw/source/ui/lingu/olmenu.cxx | 1
sw/source/ui/misc/glosbib.cxx | 1
sw/source/ui/misc/glosdoc.cxx | 1
sw/source/ui/misc/glossary.cxx | 1
sw/source/ui/misc/redlndlg.cxx | 1
sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 1
sw/source/ui/shells/grfshex.cxx | 1
sw/source/ui/shells/langhelper.cxx | 1
sw/source/ui/uiview/view2.cxx | 1
sw/source/ui/uiview/viewling.cxx | 1
sw/source/ui/uiview/viewprt.cxx | 1
sw/source/ui/uno/unoatxt.cxx | 1
sw/source/ui/uno/unotxdoc.cxx | 6 -
sw/source/ui/utlui/bookctrl.cxx | 1
sw/source/ui/utlui/content.cxx | 1
sw/source/ui/utlui/glbltree.cxx | 1
xmloff/source/style/styleexp.cxx | 2
xmloff/source/style/xmlnumfe.cxx | 1
xmloff/source/style/xmlnumi.cxx | 2
xmloff/source/style/xmltabi.cxx | 1
xmloff/source/text/XMLTextColumnsContext.cxx | 1
xmloff/source/text/txtimp.cxx | 2
173 files changed, 510 insertions(+), 626 deletions(-)
New commits:
commit 75acbd4b47b877ca140e2f802620e3830eda8839
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 25 13:52:18 2012 +0200
delete svl/svstdarr.hxx
Change-Id: Ia3d1d8dbe100443410b80c3881f10ab51b2d0419
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 85f353d..e7f95a5 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -67,7 +67,6 @@
#include <unotools/configmgr.hxx>
#include "dialmgr.hxx"
#include <svl/stritem.hxx>
-#include <svl/svstdarr.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 6e5a4ff..e7c0bb1 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -30,7 +30,6 @@
#include "macropg.hxx"
#include <vcl/msgbox.hxx>
-#include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx>
#include <svl/eitem.hxx>
#include <tools/diagnose_ex.h>
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 012bd6b..f58aa45 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -71,7 +71,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::container;
-#include <svl/svstdarr.hxx>
#include <svtools/imagemgr.hxx>
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index f731ef3..f0158b6 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -76,7 +76,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::ui::dialogs;
using ::rtl::OUString;
-#include <svl/svstdarr.hxx>
static String impl_getSvtResString( sal_uInt32 nId )
{
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index faae919..dbd87db 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -51,7 +51,6 @@
#include <dialmgr.hxx>
-#include <svl/svstdarr.hxx>
#define FILEOBJECT ( OBJECT_CLIENT_FILE & ~OBJECT_CLIENT_SO )
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 7562366..ccb06d7 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -52,7 +52,6 @@
#include <svtools/svtreebx.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/basedlgs.hxx>
-#include <svl/svstdarr.hxx>
#include <sfx2/minarray.hxx>
#include "cfgutil.hxx"
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 9043ea6..e34137f 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -38,7 +38,6 @@
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/script/browse/XBrowseNode.hpp>
-#include <svl/svstdarr.hxx>
#include <vcl/timer.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/svtreebx.hxx>
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 3ca5e29..836993e 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -32,7 +32,6 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <svx/fmsearch.hxx>
-#include <svl/svstdarr.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index fcb431c..044666d 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -30,7 +30,6 @@
#include <sfx2/childwin.hxx>
#include <sfx2/basedlgs.hxx>
#include <svl/svarray.hxx>
-#include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx>
#include <svl/srchdefs.hxx>
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index d2cdb02..1821211 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -36,7 +36,6 @@
#include <comphelper/string.hxx>
#include <dialmgr.hxx>
#include <svx/dialogs.hrc>
-#include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx>
#include "cfgutil.hxx"
#include <sfx2/app.hxx>
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 798da33..94ed697 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -33,7 +33,6 @@
#include <unotools/localedatawrapper.hxx>
#include <i18npool/lang.h>
#include <svx/dialogs.hrc>
-#include <svl/svstdarr.hxx>
#include <svtools/colorcfg.hxx>
#define _SVX_NUMFMT_CXX
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
index df1ba5d..f80a226 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
@@ -29,7 +29,6 @@
#include <SvXMLAutoCorrectExport.hxx>
#include <com/sun/star/util/MeasureUnit.hpp>
-#include <svl/svstdarr.hxx>
#include <xmloff/xmltoken.hxx>
using namespace ::com::sun::star::uno;
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index 5424338..50afcb3 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -28,7 +28,6 @@
#include <SvXMLAutoCorrectImport.hxx>
#include <vcl/svapp.hxx>
-#include <svl/svstdarr.hxx>
#include <xmloff/xmltoken.hxx>
using namespace ::com::sun::star;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 7007a50..5d6a045 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -32,7 +32,6 @@
#include <i18npool/mslangid.hxx>
#include <vcl/svapp.hxx>
#include <sot/storinfo.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/fstathelper.hxx>
#include <svtools/helpopt.hxx>
#include <svl/urihelper.hxx>
diff --git a/fpicker/source/odma/ODMAFolderPicker.cxx b/fpicker/source/odma/ODMAFolderPicker.cxx
index c5eb9a8..05d4277 100644
--- a/fpicker/source/odma/ODMAFolderPicker.cxx
+++ b/fpicker/source/odma/ODMAFolderPicker.cxx
@@ -29,7 +29,6 @@
#include "ODMAFolderPicker.hxx"
-#include "svl/svstdarr.hxx"
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
#include <com/sun/star/container/XSet.hpp>
#include <com/sun/star/uno/Any.hxx>
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 9658467..4763cb6 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -31,7 +31,6 @@
#include <algorithm>
#endif
#include <tools/urlobj.hxx>
-#include "svl/svstdarr.hxx"
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
#include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp>
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index 4883dd5..c1a3912 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -23,7 +23,6 @@
#include <list>
#include <tools/urlobj.hxx>
-#include "svl/svstdarr.hxx"
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
#include <com/sun/star/container/XSet.hpp>
#include <com/sun/star/uno/Any.hxx>
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 6b53152..291acb1 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -39,7 +39,6 @@
#include "svtools/sfxecode.hxx"
#include "svl/svarray.hxx"
#include "svtools/svtabbx.hxx"
-#include "svl/svstdarr.hxx"
#include <toolkit/helper/vclunohelper.hxx>
#include <unotools/localfilehelper.hxx>
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 63baec1..9269b07 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -38,7 +38,6 @@
#include "unotools/useroptions.hxx"
#include "rtl/instance.hxx"
#include <svl/svl.hrc>
-#include "svl/svstdarr.hxx"
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 11a640c..455f9c5 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -45,7 +45,6 @@
#include <sfx2/viewsh.hxx>
#include <svl/flagitem.hxx>
#include <svl/intitem.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <unotools/misccfg.hxx>
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index c8e0856..c24c32b 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -58,7 +58,6 @@
#include <svl/zformat.hxx>
#include <svtools/ctrltool.hxx>
-#include <svl/svstdarr.hxx>
#include <string.h>
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index ed69e11..a519250 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -51,7 +51,6 @@
#include <sfx2/objsh.hxx>
#include <svl/stritem.hxx>
#include <svl/urihelper.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/zforlist.hxx>
#include <svtools/htmlkywd.hxx>
#include <svtools/htmlout.hxx>
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 727a7ec..fe524aa 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -43,7 +43,6 @@
#include <sfx2/viewfrm.hxx>
#include <svl/stritem.hxx>
#include <svl/zforlist.hxx>
-#include <svl/svstdarr.hxx>
#include <svx/svdview.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/sound.hxx>
diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx
index dd3685c..1d846d5 100644
--- a/sfx2/inc/sfx2/appuno.hxx
+++ b/sfx2/inc/sfx2/appuno.hxx
@@ -44,7 +44,6 @@
#include <tools/errcode.hxx>
#include <svl/svarray.hxx>
-#include <svl/svstdarr.hxx>
#include <sfx2/sfxuno.hxx>
class SfxObjectShell;
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 318c4ab..5988c53 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -43,7 +43,6 @@
#include <svl/svdde.hxx>
#include <unotools/tempfile.hxx>
#include <osl/file.hxx>
-#include <svl/svstdarr.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index b40cee4..c162f3c 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -98,7 +98,6 @@
#include <sfx2/filedlghelper.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/event.hxx>
-#include <svl/svstdarr.hxx>
#include "openuriexternally.hxx"
using namespace ::com::sun::star;
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 591d96a..4ad6a59 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -41,7 +41,6 @@
#include "impldde.hxx"
#include "app.hrc"
#include "sfx2/sfxresid.hxx"
-#include <svl/svstdarr.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/util/XCloseable.hpp>
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index c2706c9..88c4563 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -56,7 +56,6 @@
#include <vcl/msgbox.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
-#include <svl/svstdarr.hxx>
#include "newhelp.hxx"
#include <sfx2/objsh.hxx>
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index ce17963..6888e09 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
#include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp>
#include <sfx2/fcontnr.hxx>
-#include <svl/svstdarr.hxx>
#include <sfx2/filedlghelper.hxx>
#include <comphelper/sequenceasvector.hxx>
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index cec8e1a..baef6c0 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -24,7 +24,6 @@
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
#include <svl/style.hxx>
-#include <svl/svstdarr.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <unotools/intlwrapper.hxx>
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 5c1f418..1411287 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -27,7 +27,6 @@
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <tools/datetime.hxx>
-#include <svl/svstdarr.hxx>
#include "versdlg.hrc"
#include "versdlg.hxx"
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 79d60fd..915e601 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -80,7 +80,6 @@
#include <svl/intitem.hxx>
#include <svtools/svparser.hxx> // SvKeyValue
#include <cppuhelper/weakref.hxx>
-#include <svl/svstdarr.hxx>
#include <unotools/streamwrap.hxx>
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index f54cde7..c763721 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -38,7 +38,6 @@
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
-#include <svl/svstdarr.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 3c76146..cf016f3 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -62,7 +62,6 @@
#include <svtools/localresaccess.hxx>
#include <svtools/addresstemplate.hxx>
#include <comphelper/processfactory.hxx>
-#include <svl/svstdarr.hxx>
sal_Bool SfxOrganizeListBox_Impl::bDropMoveOk = sal_True;
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 3192ae5..cbbed60 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -47,7 +47,6 @@
#include <sfx2/mnumgr.hxx>
-#include <svl/svstdarr.hxx>
#include <svtools/menuoptions.hxx>
#include "virtmenu.hxx"
diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
index adcee8a..2cb3544 100644
--- a/svl/Package_inc.mk
+++ b/svl/Package_inc.mk
@@ -102,7 +102,6 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svarray.hxx,svl/svarray.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svdde.hxx,svl/svdde.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svl.hrc,svl/svl.hrc))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldllapi.h,svl/svldllapi.h))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svstdarr.hxx,svl/svstdarr.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/szitem.hxx,svl/szitem.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/undo.hxx,svl/undo.hxx))
$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urihelper.hxx,svl/urihelper.hxx))
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
deleted file mode 100644
index 739f8eb..0000000
--- a/svl/inc/svl/svstdarr.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-/***********************************************************************
-*
-* Die vordefinierte Arrays werden ueber POSITIV-Defines aktiviert:
-* (die defines setzen sich aus "_SVSTDARR_" und dem Namen des Array
-* ohne "Sv" zusammen)
-*
-* SortArr: SvStringsSort, SvStringsSortDtor,
-* SvStringsISort, SvStringsISortDtor,
-***********************************************************************/
-
-#include "svl/svldllapi.h"
-
-#include <tools/string.hxx>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 014501e..06f70e0 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -30,7 +30,6 @@
#include <svl/filerec.hxx>
#include <svl/itemiter.hxx>
#include <svl/style.hxx>
-#include <svl/svstdarr.hxx>
#include <unotools/syslocale.hxx>
#include <algorithm>
#include <comphelper/servicehelper.hxx>
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 4ea8ac6..950df18 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svl/svstdarr.hxx>
#include <svl/svarray.hxx>
SV_IMPL_VARARR(SvPtrarr,VoidPtr)
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index a2291c6..cbaed94 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -28,7 +28,6 @@
#include <comphelper/processfactory.hxx>
#include <unotools/misccfg.hxx>
-#include <svl/svstdarr.hxx>
#define _ZFORLIST_CXX
#include <osl/mutex.hxx>
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 3c31e15..21ff710 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -57,7 +57,6 @@
#include <svl/itemset.hxx>
#include "svl/urihelper.hxx"
#include <unotools/pathoptions.hxx>
-#include <svl/svstdarr.hxx>
#include <ucbhelper/commandenvironment.hxx>
#include <ucbhelper/content.hxx>
#include <unotools/localfilehelper.hxx>
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 1d0fb8e..1ca5577 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -30,7 +30,6 @@
#include <svtools/svparser.hxx>
#include <tools/stream.hxx>
#include <tools/debug.hxx>
-#include <svl/svstdarr.hxx>
#include <rtl/textcvt.h>
#include <rtl/tencinfo.h>
diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx
index 2affd50..2c91914 100644
--- a/svx/inc/svx/fmsearch.hxx
+++ b/svx/inc/svx/fmsearch.hxx
@@ -30,7 +30,6 @@
#define _FMSEARCH_HXX
#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <svl/svstdarr.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx
index 54b3640..3395978 100644
--- a/svx/inc/svx/fmtools.hxx
+++ b/svx/inc/svx/fmtools.hxx
@@ -76,7 +76,6 @@
#include <comphelper/uno3.hxx>
#include <comphelper/stl_types.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <svl/svstdarr.hxx>
#include <set>
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index ba3b04c..d131e9f 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -33,7 +33,6 @@
#include "svx/svxdllapi.h"
-#include <svl/svstdarr.hxx>
#include <svl/zforlist.hxx>
#include <vector>
diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index c960c21..7f0fa67 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -39,7 +39,6 @@
#include <sfx2/childwin.hxx>
#include <sfx2/basedlgs.hxx>
#include <svl/svarray.hxx>
-#include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx>
#include <svl/srchdefs.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 1652512..f301612 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -62,7 +62,6 @@
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <svl/svstdarr.hxx>
#include <comphelper/extract.hxx>
#include <comphelper/numbers.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 1d9be6d..32c2bf1 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -35,7 +35,6 @@
#include <svtools/svtreebx.hxx>
#include <tools/diagnose_ex.h>
-#include <svl/svstdarr.hxx>
//........................................................................
namespace svxform
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 9664b4e..1ca5561 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -56,7 +56,6 @@
#include <svl/svarray.hxx>
#include <svl/lstner.hxx>
-#include <svl/svstdarr.hxx>
#include <sfx2/mnuitem.hxx>
#include "svx/fmtools.hxx"
#include "svx/fmsrccfg.hxx"
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index bb9e858..1af4be8 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#include <svl/svstdarr.hxx>
#include <svx/clipfmtitem.hxx>
#include <com/sun/star/frame/status/ClipboardFormats.hpp>
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index c90ddee..b9c1cf8 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -31,7 +31,6 @@
#include "swdllapi.h"
#include <fldbas.hxx>
#include <toxe.hxx>
-#include <svl/svstdarr.hxx>
#include <vector>
#include <boost/ptr_container/ptr_vector.hpp>
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 1529b87..ecc9eec 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -53,7 +53,6 @@
class SwList;
#include <IDocumentExternalData.hxx>
-#include <svl/svstdarr.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <vcl/timer.hxx>
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 1920985..6023143 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -30,7 +30,6 @@
#include <rtl/ref.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/style.hxx>
#include <svl/itemset.hxx>
#include "swdllapi.h"
diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx
index 446a3db..81174e1 100644
--- a/sw/inc/ftnidx.hxx
+++ b/sw/inc/ftnidx.hxx
@@ -28,7 +28,6 @@
#ifndef _FTNIDX_HXX
#define _FTNIDX_HXX
-#include <svl/svstdarr.hxx>
#include <svl/svarray.hxx>
#include <vector>
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 654a541..0b7d14c 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -28,7 +28,6 @@
#ifndef _SHELLRES_HXX
#define _SHELLRES_HXX
-#include <svl/svstdarr.hxx>
#include <swdllapi.h>
#include <tools/string.hxx>
#include <tools/rc.hxx>
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index 019b62d..794bb3a 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -27,7 +27,6 @@
************************************************************************/
#include <SwStyleNameMapper.hxx>
-#include <svl/svstdarr.hxx>
#include <tools/resmgr.hxx>
#include <poolfmt.hxx>
#include <rcid.hrc>
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 82a86fe..d9f9124 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -29,7 +29,6 @@
#include <limits.h>
#include <hintids.hxx>
#include <comphelper/string.hxx>
-#include <svl/svstdarr.hxx>
#include <editeng/langitem.hxx>
#include <editeng/brkitem.hxx>
#include <editeng/tstpitem.hxx>
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index fbbd7d6..2900cdd 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -21,7 +21,6 @@
#include <hintids.hxx>
#include <hints.hxx>
-#include <svl/svstdarr.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index ccfdfcf..6c15b8b 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -28,7 +28,6 @@
#include <hintids.hxx>
-#include <svl/svstdarr.hxx>
#include <editeng/unolingu.hxx>
#include <editeng/langitem.hxx>
#include <swtypes.hxx>
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 5934c11..2c54072 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -57,7 +57,8 @@
*/
#include <vector>
-#include <svl/svstdarr.hxx>
+
+#include <rtl/ustring.hxx>
class SwCacheObj;
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index a6de5e7..fce804f 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -33,7 +33,6 @@
#include "swfont.hxx"
#include "porlay.hxx"
-#include <svl/svstdarr.hxx>
class OutputDevice;
class SwFont;
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index 0a21161..3755a16 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#include <svl/svstdarr.hxx>
#include <doc.hxx>
#include <cntfrm.hxx> // OSL_ENSURE(in ~SwTxtFtn()
#include <pagefrm.hxx> // RemoveFtn()
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 0f24ecf..0e3c6d6 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -36,7 +36,6 @@
#include <editeng/rsiditem.hxx>
#include <editeng/tstpitem.hxx>
#include <svl/urihelper.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/ctloptions.hxx>
#include <swmodule.hxx>
#include <txtfld.hxx>
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index c4603e5..b5f2bb8 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -40,10 +40,10 @@
#include <comphelper/types.hxx>
#include <tools/urlobj.hxx>
#include <tools/datetime.hxx>
+#include <tools/string.hxx>
#include <ucbhelper/contentidentifier.hxx>
#include <ucbhelper/contentbroker.hxx>
#include <ucbhelper/content.hxx>
-#include <svl/svstdarr.hxx>
#include <swunohelper.hxx>
namespace SWUnoHelper {
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 6167cdc..3ee52b0 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -67,7 +67,6 @@
#include <editeng/flstitem.hxx>
#include <vcl/metric.hxx>
#include <svtools/ctrltool.hxx>
-#include <svl/svstdarr.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx>
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 957cb6b..aa29873 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -84,7 +84,6 @@
#include <tools/datetime.hxx>
#include <tools/urlobj.hxx>
#include <svx/dataaccessdescriptor.hxx>
-#include <svl/svstdarr.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <textapi.hxx>
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index a37d25c..28d4557 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -106,7 +106,6 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <fmtflcnt.hxx>
-#include <svl/svstdarr.hxx>
#include <editeng/brshitem.hxx>
#include <editeng/unolingu.hxx>
#include <fmtclds.hxx>
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index cc97a8e..b2b1d56 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -105,7 +105,6 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <fmtflcnt.hxx>
-#include <svl/svstdarr.hxx>
#include <editeng/brshitem.hxx>
#include <fmtclds.hxx>
#include <dcontact.hxx>
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 14ee196..64a267f 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -43,7 +43,6 @@
#include <vcl/svapp.hxx>
#include <docsh.hxx>
-#include <svl/svstdarr.hxx>
#include <com/sun/star/beans/SetPropertyTolerantFailed.hpp>
#include <com/sun/star/beans/GetPropertyTolerantResult.hpp>
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 5ca0aa8..bfefdf1 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -29,7 +29,6 @@
#include <hintids.hxx>
#include <tools/stream.hxx>
#include <comphelper/string.hxx>
-#include <svl/svstdarr.hxx>
#include <editeng/fontitem.hxx>
#include <pam.hxx>
#include <doc.hxx>
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index c39f80b..bf7ccfb 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -33,7 +33,6 @@
#include <i18npool/mslangid.hxx>
#include <vcl/msgbox.hxx>
#include <svtools/parhtml.hxx>
-#include <svl/svstdarr.hxx>
#include <sot/storage.hxx>
#include <sot/clsids.hxx>
#include <sfx2/app.hxx>
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 5f09dc9..4a64628 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -30,7 +30,6 @@
#include <comphelper/string.hxx>
#include <rtl/strbuf.hxx>
#include <sfx2/sfx.hrc>
-#include <svl/svstdarr.hxx>
#include <basic/sbx.hxx>
#include <basic/basmgr.hxx>
#include <basic/sbmod.hxx>
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 2d8f4c8..be465ee 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -32,7 +32,6 @@
#include "hintids.hxx"
#include <rtl/strbuf.hxx>
#include <svl/urihelper.hxx>
-#include <svl/svstdarr.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/frmhtml.hxx>
#include <sfx2/frmhtmlw.hxx>
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index f83e929..605e78d 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -28,7 +28,6 @@
#ifndef _SWHTML_HXX
#define _SWHTML_HXX
-#include <svl/svstdarr.hxx>
#include <sfx2/sfxhtml.hxx>
#include <svl/macitem.hxx>
#include <editeng/svxenum.hxx>
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index da8bac0..1c46ce1 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -30,7 +30,6 @@
#include <hintids.hxx>
-#include <svl/svstdarr.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/virdev.hxx>
#include <com/sun/star/drawing/XShape.hpp>
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index ee63274..39cf993 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -35,7 +35,6 @@
#include <boost/unordered_map.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <vector>
-#include <svl/svstdarr.hxx>
class SwXMLImport;
class SwTableNode;
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 5098c0b..1a4dfe7 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -51,7 +51,6 @@
#include "xmltexte.hxx"
#include <SwAppletImpl.hxx>
-#include <svl/svstdarr.hxx>
#include "svl/urihelper.hxx"
#include <sfx2/frmdescr.hxx>
#include <SwStyleNameMapper.hxx>
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 0049b7b..4244471 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -30,7 +30,6 @@
#include <osl/diagnose.h>
#include <tools/link.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/urihelper.hxx>
#include <unotools/pathoptions.hxx>
#include <svtools/accessibilityoptions.hxx>
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 3ffb065..158cd1d 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -28,7 +28,6 @@
#include <cmdid.h> // Function-Ids
-#include <svl/svstdarr.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index a6f479d..ee745ec 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -31,7 +31,6 @@
#endif
#include <hintids.hxx>
-#include <svl/svstdarr.hxx>
#include "cmdid.h"
#include "swmodule.hxx"
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 7e92407..6c8281b 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -34,7 +34,6 @@
#include <svx/htmlmode.hxx>
#include <svl/style.hxx>
#include <svtools/htmlcfg.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/cjkoptions.hxx>
#include "docsh.hxx"
#include "wrtsh.hxx"
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 961b89f..cdd49b2 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -30,7 +30,6 @@
#undef SW_DLLIMPLEMENTATION
#endif
-#include <svl/svstdarr.hxx>
#include <optpage.hxx>
#include <doc.hxx>
#include <hintids.hxx>
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 16b7022..b303131 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -59,7 +59,6 @@
#include <unotools/tempfile.hxx>
#include <unotools/pathoptions.hxx>
#include <svl/urihelper.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index 52b93da..98b955c 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -53,7 +53,6 @@
#include <dbui.hrc>
#include <vector>
#include <unomid.h>
-#include <svl/svstdarr.hxx>
using namespace utl;
using ::rtl::OUString;
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index c0b8c6e..af1559d 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -32,7 +32,6 @@
#include "hintids.hxx"
-#include <svl/svstdarr.hxx>
#include <svx/htmlmode.hxx>
#include <svx/svxids.hrc>
#include <sfx2/app.hxx>
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 0b2a072..769906c 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -32,7 +32,6 @@
#include <hintids.hxx>
-#include <svl/svstdarr.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx>
#include <svx/hdft.hxx>
diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx
index 45c2484..75df123 100644
--- a/sw/source/ui/inc/basesh.hxx
+++ b/sw/source/ui/inc/basesh.hxx
@@ -34,7 +34,6 @@
#include <vcl/timer.hxx>
#include <sfx2/module.hxx>
#include <sfx2/shell.hxx>
-#include <svl/svstdarr.hxx>
#include <viewopt.hxx>
#include <mdiexp.hxx>
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 90a1c3a..83f8a9e 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -37,7 +37,6 @@
#include <svtools/transfer.hxx>
#include <swevent.hxx>
-#include <svl/svstdarr.hxx>
class SwWrtShell;
class SwView;
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index af18d94..6c9bd11 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -28,7 +28,6 @@
#ifndef _FLDMGR_HXX
#define _FLDMGR_HXX
-#include <svl/svstdarr.hxx>
#include <tools/string.hxx>
#include "swdllapi.h"
#include "swtypes.hxx"
diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx
index 8d8780a..1a4e43c 100644
--- a/sw/source/ui/inc/label.hxx
+++ b/sw/source/ui/inc/label.hxx
@@ -28,7 +28,6 @@
#ifndef _LABEL_HXX
#define _LABEL_HXX
-#include <svl/svstdarr.hxx>
#include <sfx2/tabdlg.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <labelcfg.hxx>
diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx
index 848e81e..c90a0ed 100644
--- a/sw/source/ui/inc/redlndlg.hxx
+++ b/sw/source/ui/inc/redlndlg.hxx
@@ -32,7 +32,6 @@
#include <redline.hxx>
#include <tools/datetime.hxx>
#include <vcl/msgbox.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/eitem.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index b09b73e..2784c07 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/ui/index/idxmrk.cxx
@@ -28,7 +28,6 @@
#include <hintids.hxx>
#include <helpid.h>
-#include <svl/svstdarr.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 017f018..b8b2c62 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -33,7 +33,6 @@
#include "swuiidxmrk.hxx"
#include <hintids.hxx>
#include <helpid.h>
-#include <svl/svstdarr.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index fbc5956..0539d19 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -42,7 +42,6 @@
#include "wrtsh.hxx"
#include "wview.hxx"
-#include <svl/svstdarr.hxx>
#include <comphelper/anytostring.hxx>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 856487f..9b1fc96 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -29,7 +29,6 @@
#include <unotools/transliterationwrapper.hxx>
#include <unotools/tempfile.hxx>
-#include <svl/svstdarr.hxx>
#include <unotools/pathoptions.hxx>
#include <swtypes.hxx>
#include <glosbib.hxx>
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 90e4d60..b8d327b 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -33,7 +33,6 @@
#include <unotools/transliterationwrapper.hxx>
-#include <svl/svstdarr.hxx>
#ifndef __RSC //autogen
#include <tools/errinf.hxx>
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 376aab2..df5232b 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -36,7 +36,6 @@
#include <vcl/menu.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/help.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/stritem.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/lingucfg.hxx>
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 983b36b..6361533 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -29,7 +29,6 @@
#include <redline.hxx>
#include <tools/datetime.hxx>
#include <vcl/msgbox.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/eitem.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index 53444dd..7a97bb8 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -32,7 +32,6 @@
#include <redline.hxx>
#include <vcl/msgbox.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/eitem.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx
index 474809c..141971a 100644
--- a/sw/source/ui/shells/grfshex.cxx
+++ b/sw/source/ui/shells/grfshex.cxx
@@ -35,7 +35,6 @@
#include <swundo.hxx>
#include <shells.hrc>
#include <caption.hxx>
-#include <svl/svstdarr.hxx>
#include <svtools/filter.hxx>
#include <svx/htmlmode.hxx>
#include <doc.hxx>
diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx
index 4b389a3..fb27905 100644
--- a/sw/source/ui/shells/langhelper.cxx
+++ b/sw/source/ui/shells/langhelper.cxx
@@ -50,7 +50,6 @@
#include <svl/languageoptions.hxx>
#include <svtools/langtab.hxx>
#include <svl/slstitm.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/stritem.hxx>
#include <ndtxt.hxx>
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index ffff020..9ca89f8 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <svl/svstdarr.hxx>
#include <svl/aeitem.hxx>
#include <SwStyleNameMapper.hxx>
#include <docary.hxx>
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index ae8c234..f98f78e 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -28,7 +28,6 @@
#include <hintids.hxx>
-#include <svl/svstdarr.hxx>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/linguistic2/XThesaurus.hpp>
#include <com/sun/star/linguistic2/ProofreadingResult.hpp>
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index 4e66811..e55acc7 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/text/NotePrintMode.hpp>
#include <cstdarg>
#include <cmdid.h>
-#include <svl/svstdarr.hxx>
#include <sfx2/request.hxx>
#include <sfx2/progress.hxx>
#include <sfx2/app.hxx>
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index be5364d..bf213bf 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -30,7 +30,6 @@
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
#include <vcl/svapp.hxx>
-#include <svl/svstdarr.hxx>
#include <svtools/unoevent.hxx>
#include <svl/urihelper.hxx>
#include <sfx2/event.hxx>
diff --git a/sw/source/ui/utlui/bookctrl.cxx b/sw/source/ui/utlui/bookctrl.cxx
index accb7c1..29bcb73 100644
--- a/sw/source/ui/utlui/bookctrl.cxx
+++ b/sw/source/ui/utlui/bookctrl.cxx
@@ -19,7 +19,6 @@
#include "hintids.hxx"
-#include <svl/svstdarr.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 7842e4e..6d2d632 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -27,7 +27,6 @@
************************************************************************/
#include <comphelper/string.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/urlbmk.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index c745671..bd460d3 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#include <svl/svstdarr.hxx>
#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <sfx2/fcontnr.hxx>
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 771ae5f..d9baaa3 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -27,7 +27,7 @@
************************************************************************/
#include <tools/debug.hxx>
-#include <svl/svstdarr.hxx>
+#include <tools/string.hxx>
#include <xmloff/nmspmap.hxx>
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 896f233..9ff20ea 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -27,7 +27,6 @@
************************************************************************/
#include <comphelper/string.hxx>
-#include <svl/svstdarr.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <svl/numuno.hxx>
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 3c2d8ba..0230590 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -43,6 +43,7 @@
#include <tools/debug.hxx>
#include <tools/fontenum.hxx>
+#include <tools/string.hxx>
#include <sax/tools/converter.hxx>
@@ -62,7 +63,6 @@
#include <xmloff/xmlnumi.hxx>
-#include <svl/svstdarr.hxx>
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index 8c93259..ee9ea8c 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -36,7 +36,6 @@
#include <xmloff/xmltoken.hxx>
#include "xmloff/i18nmap.hxx"
#include <xmloff/xmluconv.hxx>
-#include <svl/svstdarr.hxx>
#include "xmltabi.hxx"
using ::rtl::OUString;
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 8bb2065..35a8a32 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -39,7 +39,6 @@
#include <xmloff/xmlimp.hxx>
#include <xmloff/xmltoken.hxx>
#include "XMLTextColumnsContext.hxx"
-#include <svl/svstdarr.hxx>
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 7b2deda..9b79c81 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -31,7 +31,6 @@
#include <boost/scoped_array.hpp>
-#include <svl/svstdarr.hxx>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/text/XChapterNumberingSupplier.hpp>
@@ -69,6 +68,7 @@
#include <txtlists.hxx>
#include <xmloff/odffields.hxx>
#include <comphelper/stlunosequence.hxx>
+#include <tools/string.hxx>
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
commit 05a6798a2eee2078ab317aadd9b3e3b5ec88d4b7
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 25 12:52:33 2012 +0200
remove typedef StringPtr
Change-Id: Ibb5b1c02a15fb1b6e4b45737b2afa9f065318071
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index a44e5d3..b2923f8 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#include <svl/svstdarr.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/field.hxx>
#include <vcl/keycodes.hxx>
@@ -2378,7 +2377,7 @@ IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl)
while( nSelCnt )
{
sal_uInt16 nPos = aLBEntries.GetSelectEntryPos( --nSelCnt );
- StringPtr pStr = (StringPtr)aLBEntries.GetEntryData( nPos );
+ String* pStr = static_cast<String*>(aLBEntries.GetEntryData(nPos));
aLBEntries.RemoveEntry( nPos );
editeng::IAutoCompleteString hack(*pStr); // UGLY
m_pAutoCompleteList->erase(&hack);
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 6b2a69c..739f8eb 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -31,6 +31,4 @@
#include <tools/string.hxx>
-typedef String* StringPtr;
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 014b548..896d88e 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -696,7 +696,7 @@ short SvxNumberFormatShell::FillEListWithFormats_Impl( std::vector<String*>& rLi
CategoryToPos_Impl(nMyCat,nMyType);
aNewFormNInfo= pNumEntry->GetFormatstring();
- const StringPtr pStr = new String(aNewFormNInfo);
+ String *const pStr = new String(aNewFormNInfo);
if ( nNFEntry == nCurFormatKey )
{
@@ -740,7 +740,7 @@ short SvxNumberFormatShell::FillEListWithDateTime_Impl( std::vector<String*>& rL
CategoryToPos_Impl(nMyCat,nMyType);
aNewFormNInfo= pNumEntry->GetFormatstring();
- const StringPtr pStr = new String(aNewFormNInfo);
+ String *const pStr = new String(aNewFormNInfo);
if ( nNFEntry == nCurFormatKey )
{
@@ -829,7 +829,7 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector<String*>& rLi
CategoryToPos_Impl(nMyCat,nMyType);
aNewFormNInfo= pNumEntry->GetFormatstring();
- const StringPtr pStr = new String(aNewFormNInfo);
+ String *const pStr = new String(aNewFormNInfo);
if ( nNFEntry == nCurFormatKey )
{
@@ -871,7 +871,7 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector<String*>& rLi
CategoryToPos_Impl(nMyCat,nMyType);
aNewFormNInfo= pNumEntry->GetFormatstring();
- const StringPtr pStr = new String(aNewFormNInfo);
+ String *const pStr = new String(aNewFormNInfo);
if ( nKey == nCurFormatKey ) nSelPos =aCurEntryList.size();
rList.push_back( pStr );
@@ -1033,7 +1033,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector<String*>& rL
size_t j;
for( j=0; j < aList.size(); ++j )
{
- const StringPtr pTestStr=aList[j];
+ const String * pTestStr=aList[j];
if(*pTestStr==aInsStr)
{
@@ -1125,7 +1125,7 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector<String*>& rList,
}
if(bFlag)
{
- const StringPtr pStr = new String(aNewFormNInfo);
+ String *const pStr = new String(aNewFormNInfo);
if ( nKey == nCurFormatKey ) nSelPos = aCurEntryList.size();
rList.push_back( pStr );
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index ebeb0b8..20a43ad 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -354,7 +354,7 @@ void SwAutoCompleteWord::SetMinWordLen( sal_uInt16 n )
sal_Bool SwAutoCompleteWord::GetRange( const String& rWord, sal_uInt16& rStt,
sal_uInt16& rEnd ) const
{
- const StringPtr pStr = (StringPtr)&rWord;
+ const String * pStr = &rWord;
editeng::IAutoCompleteString hack(*pStr); // UGLY
rStt = m_WordList.find(&hack) - m_WordList.begin();
rEnd = rStt;
commit 183ae1ebe36f25eae599e3ff65d399e59c677023
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 25 12:37:48 2012 +0200
svstdarr.hxx: remove SvXub_StrLens
Change-Id: Ia1d171b00cfbf2e541928213c39005ac873db938
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index c213b6c..6b2a69c 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -28,12 +28,9 @@
***********************************************************************/
#include "svl/svldllapi.h"
-#include <deque>
#include <tools/string.hxx>
typedef String* StringPtr;
-typedef std::deque< xub_StrLen > SvXub_StrLens;
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 247e199..004a88d 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -39,6 +39,7 @@
#include <com/sun/star/i18n/ScriptType.hpp>
#include <vector>
+#include <deque>
#include <svtools/colorcfg.hxx>
#include <svtools/sampletext.hxx>
@@ -51,7 +52,6 @@
#include <svl/itempool.hxx>
#include <svl/stritem.hxx> // SfxStringItem
#include <svl/languageoptions.hxx>
-#include <svl/svstdarr.hxx>
#include <editeng/colritem.hxx>
#include <editeng/fontitem.hxx>
@@ -146,7 +146,7 @@ class FontPrevWin_Impl
Reference < XBreakIterator > xBreak;
std::vector<sal_uIntPtr> aTextWidth;
- SvXub_StrLens aScriptChg;
+ std::deque<xub_StrLen> aScriptChg;
std::vector<sal_uInt16> aScriptType;
SvxFont aCJKFont;
SvxFont aCTLFont;
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index b58dbb2..d4738ca 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -25,11 +25,12 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _SCRIPTINFO_HXX
-#define _SCRIPTINFO_HXX
-#include <svl/svstdarr.hxx>
+#ifndef SW_SCRIPTINFO_HXX
+#define SW_SCRIPTINFO_HXX
+
#include <list>
+#include <deque>
#include "swscanner.hxx"
class SwTxtNode;
@@ -37,6 +38,7 @@ class Point;
class MultiSelection;
class String;
typedef std::list< xub_StrLen > PositionList;
+typedef std::deque< xub_StrLen > SvXub_StrLens;
#define SPACING_PRECISION_FACTOR 100
diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx
index afaf6fe..85611fc 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -25,12 +25,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _LAYHELP_HXX
-#define _LAYHELP_HXX
-#include <svl/svstdarr.hxx>
+#ifndef SW_LAYHELP_HXX
+#define SW_LAYHELP_HXX
+
#include <swrect.hxx>
#include <vector>
+#include <deque>
class SwDoc;
class SwFrm;
@@ -60,7 +61,7 @@ typedef boost::ptr_vector<SwFlyCache> SwPageFlyCache;
class SwLayCacheImpl : public std::vector<sal_uLong>
{
- SvXub_StrLens aOffset;
+ std::deque<xub_StrLen> aOffset;
std::vector<sal_uInt16> aType;
SwPageFlyCache aFlyCache;
sal_Bool bUseFlyCache;
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 4281610..dcd4b3b 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1141,7 +1141,7 @@ class HTMLEndPosLst
{
_HTMLEndLst aStartLst; // nach Anfangs-Psoitionen sortierte Liste
_HTMLEndLst aEndLst; // nach End-Psotionen sortierte Liste
- SvXub_StrLens aScriptChgLst; // positions where script changes
+ std::deque<xub_StrLen> aScriptChgLst; // positions where script changes
// 0 is not contained in this list,
// but the text length
// the script that is valif up to the position
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 30a7713..f83e929 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -387,7 +387,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
_HTMLAttrTable aAttrTab; // "offene" Attribute
_HTMLAttrContexts aContexts;// der aktuelle Attribut/Token-Kontext
SwHTMLFrmFmts aMoveFlyFrms;// Fly-Frames, the anchor is moved
- SvXub_StrLens aMoveFlyCnts;// and the Content-Positions
+ std::deque<xub_StrLen> aMoveFlyCnts;// and the Content-Positions
SwApplet_Impl *pAppletImpl; // das aktuelle Applet
commit 2dc5faa3b3c5dfe31fa8e759323469ef7c9fed3a
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 25 12:23:17 2012 +0200
move SvStringsISortDtor to editeng/svxacorr.hxx
Change-Id: I4465281396f44f53ba87db0a405586294ea65076
diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index 71d67c9..b15e63f 100644
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -26,10 +26,12 @@
*
************************************************************************/
-#ifndef _MySVXACORR_HXX
-#define _MySVXACORR_HXX
+#ifndef EE_SVXACORR_HXX
+#define EE_SVXACORR_HXX
#include <com/sun/star/embed/XStorage.hpp>
+
+#include <o3tl/sorted_vector.hxx>
#include <tools/rtti.hxx>
#include <i18npool/lang.h>
#include <tools/time.hxx>
@@ -45,12 +47,26 @@
class CharClass;
class SfxPoolItem;
class SvxAutoCorrect;
-class SvStringsISortDtor;
class SfxObjectShell;
class SotStorageRef;
class SotStorage;
class Window;
+struct CompareSvStringsISortDtor
+{
+ bool operator()( String* const& lhs, String* const& rhs ) const
+ {
+ return lhs->CompareIgnoreCaseToAscii( *rhs ) == COMPARE_LESS;
+ }
+};
+
+class SvStringsISortDtor
+ : public o3tl::sorted_vector<String*, CompareSvStringsISortDtor>
+{
+public:
+ ~SvStringsISortDtor() { DeleteAndDestroyAll(); }
+};
+
// Auto correct flags
const long CptlSttSntnc = 0x00000001; // Capital letters at the beginning of a sentence
const long CptlSttWrd = 0x00000002; // not two Capital letters at the beginning of a word
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 66fc0fd..c213b6c 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -31,25 +31,9 @@
#include <deque>
#include <tools/string.hxx>
-#include <o3tl/sorted_vector.hxx>
typedef String* StringPtr;
-#ifndef _SVSTDARR_STRINGSISORTDTOR_DECL
-
-struct SVL_DLLPUBLIC CompareSvStringsISortDtor
-{
- bool operator()( String* const& lhs, String* const& rhs ) const;
-};
-class SVL_DLLPUBLIC SvStringsISortDtor : public o3tl::sorted_vector<String*, CompareSvStringsISortDtor >
-{
-public:
- ~SvStringsISortDtor() { DeleteAndDestroyAll(); }
-};
-
-#define _SVSTDARR_STRINGSISORTDTOR_DECL
-#endif
-
typedef std::deque< xub_StrLen > SvXub_StrLens;
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 98e7f2a..4ea8ac6 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -28,10 +28,4 @@ sal_uInt16 SvPtrarr::GetPos( const VoidPtr& aElement ) const
return ( n >= nA ? USHRT_MAX : n );
}
-
-bool CompareSvStringsISortDtor::operator()( String* const& lhs, String* const& rhs ) const
-{
- return lhs->CompareIgnoreCaseToAscii( *rhs ) == COMPARE_LESS;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 0031210b26bfae38be4243f9c92d90fa213b9eb0
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 25 12:07:33 2012 +0200
autocomplete: replace horrible use of SvStringsISortDtor...
... to store not Strings but derived SwAutoCompleteStrings with
something far saner: an abstract base class with virtual dtor.
Change-Id: I7d966f385dd41154ee1c4cdb43b56ff1aace9b5e
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 7fab79e..9039541 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -40,6 +40,8 @@ class CharClass;
class CollatorWrapper;
class SmartTagMgr;
+namespace editeng { class SortedAutoCompleteStrings; }
+
// class OfaAutoCorrDlg --------------------------------------------------
class OfaAutoCorrDlg : public SfxTabDialog
@@ -439,7 +441,7 @@ class OfaAutoCompleteTabPage : public SfxTabPage
NumericField aNFMaxEntries;
AutoCompleteMultiListBox aLBEntries;
PushButton aPBEntries;
- SvStringsISortDtor* pAutoCmpltList;
+ editeng::SortedAutoCompleteStrings* m_pAutoCompleteList;
sal_uInt16 nAutoCmpltListCnt;
DECL_LINK( CheckHdl, CheckBox* );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 2808cf2..a44e5d3 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2224,7 +2224,7 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage( Window* pParent,
aNFMaxEntries (this, CUI_RES(NF_MAX_ENTRIES)),
aLBEntries (*this, CUI_RES(LB_ENTRIES)),
aPBEntries (this, CUI_RES(PB_ENTRIES)),
- pAutoCmpltList( 0 ),
+ m_pAutoCompleteList( 0 ),
nAutoCmpltListCnt( 0 )
{
FreeResource();
@@ -2303,10 +2303,10 @@ sal_Bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& )
pOpt->nAutoCmpltExpandKey = (sal_uInt16)nKey;
}
- if( pAutoCmpltList && nAutoCmpltListCnt != aLBEntries.GetEntryCount() )
+ if (m_pAutoCompleteList && nAutoCmpltListCnt != aLBEntries.GetEntryCount())
{
bModified = sal_True;
- pOpt->pAutoCmpltList = pAutoCmpltList;
+ pOpt->m_pAutoCompleteList = m_pAutoCompleteList;
}
if( bModified )
{
@@ -2342,14 +2342,16 @@ void OfaAutoCompleteTabPage::Reset( const SfxItemSet& )
}
}
- if( pOpt->pAutoCmpltList && pOpt->pAutoCmpltList->size() )
+ if (pOpt->m_pAutoCompleteList && pOpt->m_pAutoCompleteList->size())
{
- pAutoCmpltList = (SvStringsISortDtor*)pOpt->pAutoCmpltList;
- pOpt->pAutoCmpltList = 0;
- nAutoCmpltListCnt = pAutoCmpltList->size();
- for( sal_uInt16 n = 0; n < nAutoCmpltListCnt; ++n )
+ m_pAutoCompleteList = const_cast<editeng::SortedAutoCompleteStrings*>(
+ pOpt->m_pAutoCompleteList);
+ pOpt->m_pAutoCompleteList = 0;
+ nAutoCmpltListCnt = m_pAutoCompleteList->size();
+ for (size_t n = 0; n < nAutoCmpltListCnt; ++n)
{
- const StringPtr pStr = (*pAutoCmpltList)[ n ];
+ const String* pStr =
+ &(*m_pAutoCompleteList)[n]->GetAutoCompleteString();
sal_uInt16 nPos = aLBEntries.InsertEntry( *pStr );
aLBEntries.SetEntryData( nPos, (void*)pStr );
}
@@ -2371,13 +2373,15 @@ void OfaAutoCompleteTabPage::ActivatePage( const SfxItemSet& )
IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl)
{
- sal_uInt16 nSelCnt = pAutoCmpltList ? aLBEntries.GetSelectEntryCount() : 0;
+ sal_uInt16 nSelCnt =
+ (m_pAutoCompleteList) ? aLBEntries.GetSelectEntryCount() : 0;
while( nSelCnt )
{
sal_uInt16 nPos = aLBEntries.GetSelectEntryPos( --nSelCnt );
StringPtr pStr = (StringPtr)aLBEntries.GetEntryData( nPos );
aLBEntries.RemoveEntry( nPos );
- pAutoCmpltList->erase( pStr );
+ editeng::IAutoCompleteString hack(*pStr); // UGLY
+ m_pAutoCompleteList->erase(&hack);
}
return 0;
}
@@ -2400,7 +2404,7 @@ IMPL_LINK( OfaAutoCompleteTabPage, CheckHdl, CheckBox*, pBox )
void OfaAutoCompleteTabPage::CopyToClipboard() const
{
sal_uInt16 nSelCnt = aLBEntries.GetSelectEntryCount();
- if( pAutoCmpltList && nSelCnt )
+ if (m_pAutoCompleteList && nSelCnt)
{
TransferDataContainer* pCntnr = new TransferDataContainer;
::com::sun::star::uno::Reference<
diff --git a/editeng/inc/editeng/swafopt.hxx b/editeng/inc/editeng/swafopt.hxx
index 38072e6..684a183 100644
--- a/editeng/inc/editeng/swafopt.hxx
+++ b/editeng/inc/editeng/swafopt.hxx
@@ -16,21 +16,57 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVXSWAFOPT_HXX
-#define _SVXSWAFOPT_HXX
+
+#ifndef EE_SVXSWAFOPT_HXX
+#define EE_SVXSWAFOPT_HXX
+
+#include <o3tl/sorted_vector.hxx>
+
+#include <tools/string.hxx>
#include <vcl/font.hxx>
#include "editeng/editengdllapi.h"
-class SvStringsISortDtor;
class SmartTagMgr;
+namespace editeng {
+
+class EDITENG_DLLPUBLIC IAutoCompleteString
+{
+private:
+ String m_String;
+public:
+ explicit IAutoCompleteString(String const& rString) : m_String(rString) {}
+ virtual ~IAutoCompleteString() {}
+ String const& GetAutoCompleteString() const { return m_String; }
+};
+
+struct CompareAutoCompleteString
+{
+ bool operator()(IAutoCompleteString *const& lhs,
+ IAutoCompleteString *const& rhs) const
+ {
+ return lhs->GetAutoCompleteString().CompareIgnoreCaseToAscii(
+ rhs->GetAutoCompleteString()) == COMPARE_LESS;
+ }
+};
+
+class SortedAutoCompleteStrings
+ : public o3tl::sorted_vector<IAutoCompleteString*, CompareAutoCompleteString>
+{
+public:
+ ~SortedAutoCompleteStrings() { DeleteAndDestroyAll(); }
+};
+
+} // namespace editeng
+
// Class of options for AutoFormat
struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
{
Font aBulletFont;
Font aByInputBulletFont;
- const SvStringsISortDtor* pAutoCmpltList; // only valid inside the Dialog!!!
+ /// only valid inside the Dialog!!!
+ const editeng::SortedAutoCompleteStrings * m_pAutoCompleteList;
SmartTagMgr* pSmartTagMgr;
sal_Unicode cBullet;
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index 3bdf573..00f1a83 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -86,7 +86,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
nAutoCmpltWordLen = 10;
nAutoCmpltListLen = 500;
- pAutoCmpltList = 0;
+ m_pAutoCompleteList = 0;
pSmartTagMgr = 0;
}
@@ -140,7 +140,7 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla
bAutoCmpltEndless = rAFFlags.bAutoCmpltEndless;
bAutoCmpltAppendBlanc = rAFFlags.bAutoCmpltAppendBlanc;
bAutoCmpltShowAsTip = rAFFlags.bAutoCmpltShowAsTip;
- pAutoCmpltList = rAFFlags.pAutoCmpltList;
+ m_pAutoCompleteList = rAFFlags.m_pAutoCompleteList;
pSmartTagMgr = rAFFlags.pSmartTagMgr;
nAutoCmpltExpandKey = rAFFlags.nAutoCmpltExpandKey;
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 34d9abc..4628169 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -25,10 +25,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _ACMPLWRD_HXX
-#define _ACMPLWRD_HXX
-#include <svl/svstdarr.hxx>
+#ifndef SW_ACMPLWRD_HXX
+#define SW_ACMPLWRD_HXX
+
+#include <deque>
+
+#include <editeng/swafopt.hxx>
class SwDoc;
class SwAutoCompleteWord_Impl;
@@ -41,7 +44,8 @@ class SwAutoCompleteWord
{
friend class SwAutoCompleteClient;
- SvStringsISortDtor aWordLst; // contains extended strings carrying source information
+ /// contains extended strings carrying source information
+ editeng::SortedAutoCompleteStrings m_WordList;
SwAutoCompleteStringPtrDeque aLRULst;
SwAutoCompleteWord_Impl* pImpl;
@@ -57,7 +61,8 @@ public:
sal_Bool GetRange( const String& rWord, sal_uInt16& rStt, sal_uInt16& rEnd ) const;
- const String& operator[]( sal_uInt16 n ) const { return *aWordLst[ n ]; }
+ const String& operator[](size_t n) const
+ { return m_WordList[n]->GetAutoCompleteString(); }
bool IsLockWordLstLocked() const { return bLockWordLst; }
void SetLockWordLstLocked( bool bFlag ) { bLockWordLst = bFlag; }
@@ -67,8 +72,9 @@ public:
sal_uInt16 GetMinWordLen() const { return nMinWrdLen; }
void SetMinWordLen( sal_uInt16 n );
- const SvStringsISortDtor& GetWordList() const { return aWordLst; }
- void CheckChangedList( const SvStringsISortDtor& rNewLst );
+ const editeng::SortedAutoCompleteStrings& GetWordList() const
+ { return m_WordList; }
+ void CheckChangedList(const editeng::SortedAutoCompleteStrings& rNewLst);
};
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 87c0702..ebeb0b8 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -85,7 +85,8 @@ public:
typedef const SwDoc* SwDocPtr;
typedef std::vector<SwDocPtr> SwDocPtrVector;
-class SwAutoCompleteString : public String
+class SwAutoCompleteString
+ : public editeng::IAutoCompleteString
{
#if OSL_DEBUG_LEVEL > 0
static sal_uLong nSwAutoCompleteStringCount;
@@ -184,8 +185,9 @@ void SwAutoCompleteWord_Impl::RemoveDocument(const SwDoc& rDoc)
}
}
-SwAutoCompleteString::SwAutoCompleteString(const String& rStr, xub_StrLen nPos, xub_StrLen nLen) :
- String( rStr, nPos, nLen )
+SwAutoCompleteString::SwAutoCompleteString(
+ const String& rStr, xub_StrLen const nPos, xub_StrLen const nLen)
+ : editeng::IAutoCompleteString(String(rStr, nPos, nLen))
{
#if OSL_DEBUG_LEVEL > 0
++nSwAutoCompleteStringCount;
@@ -223,7 +225,7 @@ bool SwAutoCompleteString::RemoveDocument(const SwDoc& rDoc)
}
SwAutoCompleteWord::SwAutoCompleteWord( sal_uInt16 nWords, sal_uInt16 nMWrdLen )
- : aWordLst(),
+ :
pImpl(new SwAutoCompleteWord_Impl(*this)),
nMaxCount( nWords ),
nMinWrdLen( nMWrdLen ),
@@ -233,12 +235,7 @@ SwAutoCompleteWord::SwAutoCompleteWord( sal_uInt16 nWords, sal_uInt16 nMWrdLen )
SwAutoCompleteWord::~SwAutoCompleteWord()
{
- for(sal_uInt16 nPos = aWordLst.size(); nPos; nPos--)
- {
- SwAutoCompleteString* pCurrent = (SwAutoCompleteString*)aWordLst[ nPos - 1 ];
- aWordLst.erase( aWordLst.begin() + nPos - 1 );
- delete pCurrent;
- }
+ m_WordList.DeleteAndDestroyAll(); // so the assertion below works
delete pImpl;
#if OSL_DEBUG_LEVEL > 0
sal_uLong nStrings = SwAutoCompleteString::GetElementCount();
@@ -273,8 +270,9 @@ sal_Bool SwAutoCompleteWord::InsertWord( const String& rWord, SwDoc& rDoc )
{
SwAutoCompleteString* pNew = new SwAutoCompleteString( aNewWord, 0, nWrdLen );
pNew->AddDocument(rDoc);
- std::pair<SvStringsISortDtor::const_iterator, bool> aInsPair;
- if( (aInsPair = aWordLst.insert( pNew )).second )
+ std::pair<editeng::SortedAutoCompleteStrings::const_iterator, bool>
+ aInsPair = m_WordList.insert(pNew);
+ if (aInsPair.second)
{
bRet = sal_True;
if (aLRULst.size() >= nMaxCount)
@@ -283,7 +281,7 @@ sal_Bool SwAutoCompleteWord::InsertWord( const String& rWord, SwDoc& rDoc )
// so that there is space for the first one
SwAutoCompleteString* pDel = aLRULst.back();
aLRULst.pop_back();
- aWordLst.erase( pDel );
+ m_WordList.erase(pDel);
delete pDel;
}
aLRULst.push_front(pNew);
@@ -316,15 +314,13 @@ void SwAutoCompleteWord::SetMaxCount( sal_uInt16 nNewMax )
{
// remove the trailing ones
sal_uInt16 nLRUIndex = nNewMax-1;
- while( nNewMax < aWordLst.size() && nLRUIndex < aLRULst.size())
+ while (nNewMax < m_WordList.size() && nLRUIndex < aLRULst.size())
{
- SvStringsISortDtor::const_iterator it =
- aWordLst.find( aLRULst[ nLRUIndex++ ] );
- OSL_ENSURE( aWordLst.end() != it, "String not found" );
- //FIXME this is utterly horrid: SwAutoCompleteString should
- // NOT derive from String
- SwAutoCompleteString* pDel = (SwAutoCompleteString*) *it;
- aWordLst.erase( it );
+ editeng::SortedAutoCompleteStrings::const_iterator it =
+ m_WordList.find(aLRULst[ nLRUIndex++ ]);
+ OSL_ENSURE( m_WordList.end() != it, "String not found" );
+ editeng::IAutoCompleteString *const pDel = *it;
+ m_WordList.erase(it);
delete pDel;
}
aLRULst.erase( aLRULst.begin() + nNewMax - 1, aLRULst.end() );
@@ -337,11 +333,12 @@ void SwAutoCompleteWord::SetMinWordLen( sal_uInt16 n )
// Do you really want to remove all words that are less than the minWrdLen?
if( n < nMinWrdLen )
{
- for( sal_uInt16 nPos = 0; nPos < aWordLst.size(); ++nPos )
- if( aWordLst[ nPos ]->Len() < n )
+ for (size_t nPos = 0; nPos < m_WordList.size(); ++nPos)
+ if (m_WordList[ nPos ]->GetAutoCompleteString().Len() < n)
{
- SwAutoCompleteString* pDel = (SwAutoCompleteString*) aWordLst[ nPos ];
- aWordLst.erase(aWordLst.begin() + nPos);
+ SwAutoCompleteString *const pDel =
+ dynamic_cast<SwAutoCompleteString*>(m_WordList[nPos]);
+ m_WordList.erase(nPos);
SwAutoCompleteStringPtrDeque::iterator it = std::find( aLRULst.begin(), aLRULst.end(), pDel );
OSL_ENSURE( aLRULst.end() != it, "String not found" );
@@ -358,28 +355,34 @@ sal_Bool SwAutoCompleteWord::GetRange( const String& rWord, sal_uInt16& rStt,
sal_uInt16& rEnd ) const
{
const StringPtr pStr = (StringPtr)&rWord;
- rStt = aWordLst.find( pStr ) - aWordLst.begin();
+ editeng::IAutoCompleteString hack(*pStr); // UGLY
+ rStt = m_WordList.find(&hack) - m_WordList.begin();
rEnd = rStt;
const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
- while( rEnd < aWordLst.size() && rSCmp.isMatch( rWord, *aWordLst[ rEnd ]))
+ while (rEnd < m_WordList.size() &&
+ rSCmp.isMatch(rWord, m_WordList[rEnd]->GetAutoCompleteString()))
+ {
++rEnd;
+ }
return rStt < rEnd;
}
-void SwAutoCompleteWord::CheckChangedList( const SvStringsISortDtor& rNewLst )
+void SwAutoCompleteWord::CheckChangedList(
+ const editeng::SortedAutoCompleteStrings& rNewLst)
{
- sal_uInt16 nMyLen = aWordLst.size(), nNewLen = rNewLst.size();
- sal_uInt16 nMyPos = 0, nNewPos = 0;
+ size_t nMyLen = m_WordList.size(), nNewLen = rNewLst.size();
+ size_t nMyPos = 0, nNewPos = 0;
for( ; nMyPos < nMyLen && nNewPos < nNewLen; ++nMyPos, ++nNewPos )
{
- const StringPtr pStr = rNewLst[ nNewPos ];
- while( aWordLst[ nMyPos ] != pStr )
+ const editeng::IAutoCompleteString * pStr = rNewLst[ nNewPos ];
+ while (m_WordList[nMyPos] != pStr)
{
- SwAutoCompleteString* pDel = (SwAutoCompleteString*) aWordLst[ nMyPos ];
- aWordLst.erase(aWordLst.begin() + nMyPos);
+ SwAutoCompleteString *const pDel =
+ dynamic_cast<SwAutoCompleteString*>(m_WordList[nMyPos]);
+ m_WordList.erase(nMyPos);
SwAutoCompleteStringPtrDeque::iterator it = std::find( aLRULst.begin(), aLRULst.end(), pDel );
OSL_ENSURE( aLRULst.end() != it, "String not found" );
@@ -395,14 +398,16 @@ void SwAutoCompleteWord::CheckChangedList( const SvStringsISortDtor& rNewLst )
// clear LRU array first then delete the string object
for( ; nNewPos < nMyLen; ++nNewPos )
{
- SwAutoCompleteString* pDel = (SwAutoCompleteString*) aWordLst[ nNewPos ];
+ SwAutoCompleteString *const pDel =
+ dynamic_cast<SwAutoCompleteString*>(m_WordList[nNewPos]);
SwAutoCompleteStringPtrDeque::iterator it = std::find( aLRULst.begin(), aLRULst.end(), pDel );
OSL_ENSURE( aLRULst.end() != it, "String not found" );
aLRULst.erase( it );
delete pDel;
}
// remove from array
- aWordLst.erase( aWordLst.begin() + nMyPos, aWordLst.begin() + nMyLen);
+ m_WordList.erase(m_WordList.begin() + nMyPos,
+ m_WordList.begin() + nMyLen);
}
}
@@ -412,12 +417,13 @@ void SwAutoCompleteWord::DocumentDying(const SwDoc& rDoc)
SvxAutoCorrect* pACorr = SvxAutoCorrCfg::Get().GetAutoCorrect();
const sal_Bool bDelete = !pACorr->GetSwFlags().bAutoCmpltKeepList;
- for(sal_uInt16 nPos = aWordLst.size(); nPos; nPos--)
+ for (size_t nPos = m_WordList.size(); nPos; nPos--)
{
- SwAutoCompleteString* pCurrent = (SwAutoCompleteString*)aWordLst[ nPos - 1 ];
+ SwAutoCompleteString *const pCurrent =
+ dynamic_cast<SwAutoCompleteString*>(m_WordList[nPos - 1]);
if(pCurrent->RemoveDocument(rDoc) && bDelete)
{
- aWordLst.erase( aWordLst.begin() + nPos - 1 );
+ m_WordList.erase(nPos - 1);
SwAutoCompleteStringPtrDeque::iterator it = std::find( aLRULst.begin(), aLRULst.end(), pCurrent );
OSL_ENSURE( aLRULst.end() != it, "word not found in LRU list" );
aLRULst.erase( it );
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 32ee547..6138d48 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -642,8 +642,8 @@ void SwDocShell::Execute(SfxRequest& rReq)
rACW.SetLockWordLstLocked( true );
- SvStringsISortDtor aTmpLst( rACW.GetWordList() );
- pAFlags->pAutoCmpltList = &aTmpLst;
+ editeng::SortedAutoCompleteStrings aTmpLst( rACW.GetWordList() );
+ pAFlags->m_pAutoCompleteList = &aTmpLst;
SfxApplication* pApp = SFX_APP();
SfxRequest aAppReq(SID_AUTO_CORRECT_DLG, SFX_CALLMODE_SYNCHRON, pApp->GetPool());
@@ -670,11 +670,11 @@ void SwDocShell::Execute(SfxRequest& rReq)
SwEditShell::SetAutoFmtFlags( pAFlags );
rACW.SetMinWordLen( pAFlags->nAutoCmpltWordLen );
rACW.SetMaxCount( pAFlags->nAutoCmpltListLen );
- if( pAFlags->pAutoCmpltList ) // any changes?
+ if (pAFlags->m_pAutoCompleteList) // any changes?
{
rACW.CheckChangedList( aTmpLst );
// clear the temp WordList pointer
- pAFlags->pAutoCmpltList = 0;
+ pAFlags->m_pAutoCompleteList = 0;
}
// remove all pointer we never delete the strings
aTmpLst.clear();
commit 70d9e9bfcdad5f3b18487a87d0bfe2a2a6213b19
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 25 12:06:57 2012 +0200
tblrwcl.cxx: convert 2 sorted_vectors to 1 map
Change-Id: I79241fd05e45a2022e1e058c131507e45aeec058
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 5d3497e..0bbab2e 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -78,7 +78,7 @@ using namespace ::com::sun::star;
#define CHECK_TABLE(t)
#endif
-typedef o3tl::sorted_vector<SwTableLine*> SwSortTableLines;
+typedef std::map<SwTableLine*, sal_uInt16> SwTableLineWidthMap_t;
// In order to set the Frame Formats for the Boxes, it's enough to look
// up the current one in the array. If it's already there return the new one.
@@ -104,8 +104,7 @@ struct _CpyTabFrm
struct CR_SetBoxWidth
{
SwSelBoxes aBoxes;
- SwSortTableLines aLines;
- std::vector<sal_uInt16> aLinesWidth;
+ SwTableLineWidthMap_t m_LineWidthMap;
SwShareBoxFmts aShareFmts;
SwTableNode* pTblNd;
SwUndoTblNdsChg* pUndo;
@@ -127,7 +126,8 @@ struct CR_SetBoxWidth
nMode = pTblNd->GetTable().GetTblChgMode();
}
CR_SetBoxWidth( const CR_SetBoxWidth& rCpy )
- : aLines( rCpy.aLines ),
+ : m_LineWidthMap(rCpy.m_LineWidthMap)
+ ,
pTblNd( rCpy.pTblNd ),
pUndo( rCpy.pUndo ),
nDiff( rCpy.nDiff ), nSide( rCpy.nSide ),
@@ -137,7 +137,6 @@ struct CR_SetBoxWidth
bBigger( rCpy.bBigger ), bLeft( rCpy.bLeft ),
bSplittBox( rCpy.bSplittBox ), bAnyBoxFnd( rCpy.bAnyBoxFnd )
{
- aLinesWidth = rCpy.aLinesWidth;
}
SwUndoTblNdsChg* CreateUndo( SwUndoId eUndoType )
@@ -153,24 +152,19 @@ struct CR_SetBoxWidth
void AddBoxWidth( const SwTableBox& rBox, sal_uInt16 nWidth )
{
SwTableLine* p = (SwTableLine*)rBox.GetUpper();
- std::pair<SwSortTableLines::const_iterator, bool> aPair = aLines.insert( p );
- sal_uInt16 nFndPos = aPair.first - aLines.begin();
- if( aPair.second )
- aLinesWidth.insert( aLinesWidth.begin() + nFndPos, nWidth );
- else
- aLinesWidth[ nFndPos ] = aLinesWidth[ nFndPos ] + nWidth;
+ std::pair<SwTableLineWidthMap_t::iterator, bool> aPair =
+ m_LineWidthMap.insert(std::make_pair(p,nWidth));
+ if (!aPair.second)
+ {
+ aPair.first->second += nWidth;
+ }
}
sal_uInt16 GetBoxWidth( const SwTableLine& rLn ) const
{
SwTableLine* p = (SwTableLine*)&rLn;
- SwSortTableLines::const_iterator it = aLines.find( p );
- sal_uInt16 nFndPos;
- if( it != aLines.end() )
- nFndPos = aLinesWidth[ it - aLines.begin() ];
- else
- nFndPos = 0;
- return nFndPos;
+ SwTableLineWidthMap_t::const_iterator const it = m_LineWidthMap.find(p);
+ return (it != m_LineWidthMap.end()) ? it->second : 0;
}
};
commit e91f86771b6cd3ef0b414853c720c9dbb0c7fa77
Author: Noel Grandin <noel at peralex.com>
Date: Wed Jul 18 11:44:43 2012 +0200
Convert SV_DECL_PTRARR_DEL(StringList) to std::vector
Note that this file is not built, so this change is untested.
Change-Id: Iabfbd1c020dee4d7f6b490768345b7d14c80e097
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index 4491e3a..e10f315 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -90,6 +90,7 @@
#include <osl/file.hxx>
#include <osl/process.h>
#include <rtl/bootstrap.hxx>
+#include <vector>
#define TB_LEFT 1
#define TB_RIGHT 2
@@ -177,8 +178,16 @@ Reference< XMultiServiceFactory > createApplicationServiceManager()
// --- class EditApp -------------------------------------------------
-SV_DECL_PTRARR_DEL( StringList, String*, 0 );
-SV_IMPL_PTRARR( StringList, String* );
+class StringList : public std::vector<String*>
+{
+public:
+ ~StringList()
+ {
+ for( const_iterator it = begin(); it != end(); ++it )
+ delete *it;
+ }
+};
+
StringList aSimpleHistory;
class EditApp : public Application
commit 31dafba4d7360746abedf93e0476f053e318077c
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jul 17 15:54:06 2012 +0200
Convert SV_DECL_PTRARR_DEL(_SwSeqFldList) to std::vector
Change-Id: I40802ba1e7b2e2f6f57c59c4d66b544604d01ce5
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 0663ef5..ed7e9d5 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -32,6 +32,7 @@
#include <fldbas.hxx>
#include <cellfml.hxx>
#include <set>
+#include <vector>
class SfxPoolItem;
class SwTxtNode;
@@ -58,15 +59,24 @@ struct _SeqFldLstElem
: sDlgEntry( rStr ), nSeqNo( nNo )
{}
};
-SV_DECL_PTRARR_DEL( _SwSeqFldList, _SeqFldLstElem*, 10 )
-class SW_DLLPUBLIC SwSeqFldList : public _SwSeqFldList
+class SW_DLLPUBLIC SwSeqFldList
{
+ std::vector<_SeqFldLstElem*> maData;
public:
- SwSeqFldList() : _SwSeqFldList( 10 ) {}
-
- sal_Bool InsertSort( _SeqFldLstElem* );
- sal_Bool SeekEntry( const _SeqFldLstElem& , sal_uInt16* pPos = 0 );
+ ~SwSeqFldList()
+ {
+ for( std::vector<_SeqFldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it )
+ delete *it;
+ }
+
+ bool InsertSort(_SeqFldLstElem* pNew);
+ bool SeekEntry(const _SeqFldLstElem& rNew, sal_uInt16* pPos) const;
+
+ sal_uInt16 Count() { return maData.size(); }
+ _SeqFldLstElem* operator[](sal_uInt16 nIndex) { return maData[nIndex]; }
+ const _SeqFldLstElem* operator[](sal_uInt16 nIndex) const { return maData[nIndex]; }
+ void Clear() { maData.clear(); }
};
class SwGetExpFieldType : public SwValueFieldType
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index bea269b..8d78f07 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -338,8 +338,7 @@ bool SwEditShell::HasFtns( bool bEndNotes ) const
// gebe Liste aller Fussnoten und deren Anfangstexte
sal_uInt16 SwEditShell::GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes )
{
- if( rList.Count() )
- rList.Remove( 0, rList.Count() );
+ rList.Clear();
sal_uInt16 n, nFtnCnt = pDoc->GetFtnIdxs().Count();
SwTxtFtn* pTxtFtn;
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 29aa927..acf402a 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -68,8 +68,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
using ::rtl::OUString;
-SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* )
-
//-----------------------------------------------------------------------------
sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType)
{
@@ -596,8 +594,7 @@ extern void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt
sal_uInt16 SwSetExpFieldType::GetSeqFldList( SwSeqFldList& rList )
{
- if( rList.Count() )
- rList.Remove( 0, rList.Count() );
+ rList.Clear();
SwIterator<SwFmtFld,SwFieldType> aIter( *this );
const SwTxtNode* pNd;
@@ -705,7 +702,7 @@ bool SwSetExpFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
return true;
}
-sal_Bool SwSeqFldList::InsertSort( _SeqFldLstElem* pNew )
+bool SwSeqFldList::InsertSort( _SeqFldLstElem* pNew )
{
sal_Unicode* p = pNew->sDlgEntry.GetBufferAccess();
while( *p )
@@ -716,15 +713,15 @@ sal_Bool SwSeqFldList::InsertSort( _SeqFldLstElem* pNew )
}
sal_uInt16 nPos;
- sal_Bool bRet = SeekEntry( *pNew, &nPos );
+ bool bRet = SeekEntry( *pNew, &nPos );
if( !bRet )
- C40_INSERT( _SeqFldLstElem, pNew, nPos );
+ maData.insert( maData.begin() + nPos, pNew );
return bRet;
}
-sal_Bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, sal_uInt16* pP )
+bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, sal_uInt16* pP ) const
{
- sal_uInt16 nO = Count(), nM, nU = 0;
+ sal_uInt16 nO = maData.size(), nM, nU = 0;
if( nO > 0 )
{
CollatorWrapper & rCaseColl = ::GetAppCaseCollator(),
@@ -746,7 +743,7 @@ sal_Bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, sal_uInt16* pP )
//#59900# Die Sortierung soll die Nummer korrekt einordnen
//also "10" nach "9" und nicht "10" nach "1"
- const String& rTmp1 = (*((_SeqFldLstElem**)pData + nM))->sDlgEntry;
+ const String& rTmp1 = maData[nM]->sDlgEntry;
xub_StrLen nFndPos1 = 0;
String sNum1( rTmp1.GetToken( 0, ' ', nFndPos1 ));
sal_Int32 nCmp;
@@ -765,7 +762,7 @@ sal_Bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, sal_uInt16* pP )
if( 0 == nCmp )
{
if( pP ) *pP = nM;
- return sal_True;
+ return true;
}
else if( 0 < nCmp )
nU = nM + 1;
@@ -776,7 +773,7 @@ sal_Bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, sal_uInt16* pP )
}
}
if( pP ) *pP = nU;
- return sal_False;
+ return false;
}
/*--------------------------------------------------------------------
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 2e96d4f..571540e 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -50,9 +50,6 @@
#include <IDocumentMarkAccess.hxx>
#include <ndtxt.hxx>
-// sw/inc/expfld.hxx
-SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* )
-
#define REFFLDFLAG 0x4000
#define REFFLDFLAG_BOOKMARK 0x4800
#define REFFLDFLAG_FOOTNOTE 0x5000
commit 5da921cc53d69ed3f026542af05805decd28553c
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jul 17 15:29:42 2012 +0200
Convert SV_DECL_PTRARR_SORT(SwSortTableLines) to o3tl::sorted_vector
Change-Id: If6f0b65ddadef35afce3d75d582f5531baeacb8f
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 3b66da5..5d3497e 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -78,9 +78,7 @@ using namespace ::com::sun::star;
#define CHECK_TABLE(t)
#endif
-typedef SwTableLine* SwTableLinePtr;
-SV_DECL_PTRARR_SORT( SwSortTableLines, SwTableLinePtr, 16 )
-SV_IMPL_PTRARR_SORT( SwSortTableLines, SwTableLinePtr );
+typedef o3tl::sorted_vector<SwTableLine*> SwSortTableLines;
// In order to set the Frame Formats for the Boxes, it's enough to look
// up the current one in the array. If it's already there return the new one.
@@ -129,7 +127,8 @@ struct CR_SetBoxWidth
nMode = pTblNd->GetTable().GetTblChgMode();
}
CR_SetBoxWidth( const CR_SetBoxWidth& rCpy )
- : pTblNd( rCpy.pTblNd ),
+ : aLines( rCpy.aLines ),
+ pTblNd( rCpy.pTblNd ),
pUndo( rCpy.pUndo ),
nDiff( rCpy.nDiff ), nSide( rCpy.nSide ),
nMaxSize( rCpy.nMaxSize ), nLowerDiff( 0 ),
@@ -138,7 +137,6 @@ struct CR_SetBoxWidth
bBigger( rCpy.bBigger ), bLeft( rCpy.bLeft ),
bSplittBox( rCpy.bSplittBox ), bAnyBoxFnd( rCpy.bAnyBoxFnd )
{
- aLines.Insert( &rCpy.aLines );
aLinesWidth = rCpy.aLinesWidth;
}
@@ -154,20 +152,22 @@ struct CR_SetBoxWidth
void AddBoxWidth( const SwTableBox& rBox, sal_uInt16 nWidth )
{
- SwTableLinePtr p = (SwTableLine*)rBox.GetUpper();
- sal_uInt16 nFndPos;
- if( aLines.Insert( p, nFndPos ))
- aLinesWidth.insert( aLinesWidth.begin()+nFndPos, nWidth );
+ SwTableLine* p = (SwTableLine*)rBox.GetUpper();
+ std::pair<SwSortTableLines::const_iterator, bool> aPair = aLines.insert( p );
+ sal_uInt16 nFndPos = aPair.first - aLines.begin();
+ if( aPair.second )
+ aLinesWidth.insert( aLinesWidth.begin() + nFndPos, nWidth );
else
aLinesWidth[ nFndPos ] = aLinesWidth[ nFndPos ] + nWidth;
}
sal_uInt16 GetBoxWidth( const SwTableLine& rLn ) const
{
- SwTableLinePtr p = (SwTableLine*)&rLn;
+ SwTableLine* p = (SwTableLine*)&rLn;
+ SwSortTableLines::const_iterator it = aLines.find( p );
sal_uInt16 nFndPos;
- if( aLines.Seek_Entry( p, &nFndPos ) )
- nFndPos = aLinesWidth[ nFndPos ];
+ if( it != aLines.end() )
+ nFndPos = aLinesWidth[ it - aLines.begin() ];
else
nFndPos = 0;
return nFndPos;
commit 89bdd3ae05a30de446119159f86daf692210fcd3
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jul 17 15:12:40 2012 +0200
Convert SV_DECL_PTRARR_DEL(SwRedlineSaveDatas) to std::vector
Change-Id: Ia12d7f9020ca492470cc8ff48df1cc5988c05853
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index d05bf0b..460a0b6 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -45,8 +45,12 @@ namespace sw {
class IShellCursorSupplier;
}
-typedef SwRedlineSaveData* SwRedlineSaveDataPtr;
-SV_DECL_PTRARR_DEL( SwRedlineSaveDatas, SwRedlineSaveDataPtr, 8 )
+class SwRedlineSaveDatas : public std::vector<SwRedlineSaveData*> {
+public:
+ ~SwRedlineSaveDatas() { DeleteAndDestroyAll(); }
+
+ void DeleteAndDestroyAll();
+};
namespace sw {
class SW_DLLPRIVATE UndoRedoContext
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 28703e1..a67586b 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -65,8 +65,6 @@ public:
#endif
};
-SV_IMPL_PTRARR( SwRedlineSaveDatas, SwRedlineSaveDataPtr )
-
// This class saves the Pam as sal_uInt16s and can recompose those into a PaM
SwUndRng::SwUndRng()
: nSttNode( 0 ), nEndNode( 0 ), nSttCntnt( 0 ), nEndCntnt( 0 )
@@ -1032,8 +1030,7 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM& rPam )
sal_Bool SwUndo::FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData,
sal_Bool bDelRange, sal_Bool bCopyNext )
{
- if( rSData.Count() )
- rSData.DeleteAndDestroy( 0, rSData.Count() );
+ rSData.DeleteAndDestroyAll();
SwRedlineSaveData* pNewData;
const SwPosition *pStt = rRange.Start(), *pEnd = rRange.End();
@@ -1051,18 +1048,17 @@ sal_Bool SwUndo::FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData,
{
pNewData = new SwRedlineSaveData( eCmpPos, *pStt, *pEnd,
*pRedl, bCopyNext );
- rSData.Insert( pNewData, rSData.Count() );
+ rSData.push_back( pNewData );
}
}
- if( rSData.Count() && bDelRange )
+ if( !rSData.empty() && bDelRange )
rRange.GetDoc()->DeleteRedline( rRange, false, USHRT_MAX );
- return 0 != rSData.Count();
+ return !rSData.empty();
}
sal_Bool SwUndo::FillSaveDataForFmt( const SwPaM& rRange, SwRedlineSaveDatas& rSData )
{
- if( rSData.Count() )
- rSData.DeleteAndDestroy( 0, rSData.Count() );
+ rSData.DeleteAndDestroyAll();
SwRedlineSaveData* pNewData;
const SwPosition *pStt = rRange.Start(), *pEnd = rRange.End();
@@ -1082,13 +1078,13 @@ sal_Bool SwUndo::FillSaveDataForFmt( const SwPaM& rRange, SwRedlineSaveDatas& rS
{
pNewData = new SwRedlineSaveData( eCmpPos, *pStt, *pEnd,
*pRedl, sal_True );
- rSData.Insert( pNewData, rSData.Count() );
+ rSData.push_back( pNewData );
}
}
}
- return 0 != rSData.Count();
+ return !rSData.empty();
}
void SwUndo::SetSaveData( SwDoc& rDoc, const SwRedlineSaveDatas& rSData )
@@ -1097,12 +1093,12 @@ void SwUndo::SetSaveData( SwDoc& rDoc, const SwRedlineSaveDatas& rSData )
rDoc.SetRedlineMode_intern( (RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON ));
SwPaM aPam( rDoc.GetNodes().GetEndOfContent() );
- for( sal_uInt16 n = rSData.Count(); n; )
+ for( sal_uInt16 n = rSData.size(); n; )
rSData[ --n ]->RedlineToDoc( aPam );
#if OSL_DEBUG_LEVEL > 0
// check redline count against count saved in RedlineSaveData object
- assert((rSData.Count() == 0) ||
+ assert(rSData.empty() ||
(rSData[0]->nRedlineCount == rDoc.GetRedlineTbl().Count()));
// "redline count not restored properly"
#endif
@@ -1112,7 +1108,7 @@ void SwUndo::SetSaveData( SwDoc& rDoc, const SwRedlineSaveDatas& rSData )
sal_Bool SwUndo::HasHiddenRedlines( const SwRedlineSaveDatas& rSData )
{
- for( sal_uInt16 n = rSData.Count(); n; )
+ for( sal_uInt16 n = rSData.size(); n; )
if( rSData[ --n ]->GetMvSttIdx() )
return sal_True;
return sal_False;
@@ -1124,10 +1120,10 @@ sal_Bool SwUndo::CanRedlineGroup( SwRedlineSaveDatas& rCurr,
sal_Bool bRet = sal_False;
sal_uInt16 n;
- if( rCurr.Count() == rCheck.Count() )
+ if( rCurr.size() == rCheck.size() )
{
bRet = sal_True;
- for( n = 0; n < rCurr.Count(); ++n )
+ for( n = 0; n < rCurr.size(); ++n )
{
const SwRedlineSaveData& rSet = *rCurr[ n ];
const SwRedlineSaveData& rGet = *rCheck[ n ];
@@ -1143,7 +1139,7 @@ sal_Bool SwUndo::CanRedlineGroup( SwRedlineSaveDatas& rCurr,
}
if( bRet )
- for( n = 0; n < rCurr.Count(); ++n )
+ for( n = 0; n < rCurr.size(); ++n )
{
SwRedlineSaveData& rSet = *rCurr[ n ];
const SwRedlineSaveData& rGet = *rCheck[ n ];
@@ -1200,4 +1196,12 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos,
);
}
+void SwRedlineSaveDatas::DeleteAndDestroyAll()
+{
+ for( const_iterator it = begin(); it != end(); ++it )
+ delete *it;
+ clear();
+}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index 4f74499..6938d91 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -90,7 +90,7 @@ SwUndoRedline::~SwUndoRedline()
sal_uInt16 SwUndoRedline::GetRedlSaveCount() const
{
- return pRedlSaveData ? pRedlSaveData->Count() : 0;
+ return pRedlSaveData ? pRedlSaveData->size() : 0;
}
void SwUndoRedline::UndoImpl(::sw::UndoRedoContext & rContext)
@@ -106,7 +106,7 @@ void SwUndoRedline::UndoImpl(::sw::UndoRedoContext & rContext)
SetSaveData( *pDoc, *pRedlSaveData );
if( bHiddenRedlines )
{
- pRedlSaveData->DeleteAndDestroy( 0, pRedlSaveData->Count() );
+ pRedlSaveData->DeleteAndDestroyAll();
nEndExtra = pDoc->GetNodes().GetEndOfExtras().GetIndex() - nEndExtra;
nSttNode += nEndExtra;
commit b09b1ed26437c6e801ce71363a4416031cb40920
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jul 19 13:24:54 2012 +0200
Convert SV_DECL_PTRARR_SORT(SwTableSortBoxes) to o3tl::sorted_vector
Change-Id: Id5ff378b25619a9bf126824b4abadd19615b7a31
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 8a6624e..600da7d 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -29,7 +29,6 @@
#define _SWTABLE_HXX
#include <tools/mempool.hxx>
#include <tools/ref.hxx>
-#include <svl/svarray.hxx>
#include <tblenum.hxx>
#include <swtypes.hxx>
#include <calbck.hxx>
@@ -39,6 +38,7 @@
#include <boost/noncopyable.hpp>
#include <vector>
#include <algorithm>
+#include <o3tl/sorted_vector.hxx>
class SwStartNode;
class SwFmt;
@@ -98,8 +98,7 @@ public:
// Save content-bearing box-pointers additionally in a sorted array
// (for calculation in table).
-typedef SwTableBox* SwTableBoxPtr;
-SV_DECL_PTRARR_SORT( SwTableSortBoxes, SwTableBoxPtr, 25 )
+class SwTableSortBoxes : public o3tl::sorted_vector<SwTableBox*> {};
class SW_DLLPUBLIC SwTable: public SwClient //Client of FrmFmt.
{
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 63fa38a..778333d 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -51,6 +51,7 @@ class SwUndoTblMerge;
class SwCellFrm;
typedef ::std::deque< SwCellFrm* > SwCellFrms;
+typedef SwTableBox* SwTableBoxPtr;
SV_DECL_PTRARR_SORT( SwSelBoxes, SwTableBoxPtr, 10 )
// Collects all boxes in table that are selected.
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 2273fd7..18bd0c2 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -799,7 +799,7 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
SwTable& rTbl = pTblNd->GetTable();
// Did we select the whole table?
- if( pSelBoxes->Count() == rTbl.GetTabSortBoxes().Count() )
+ if( pSelBoxes->Count() == rTbl.GetTabSortBoxes().size() )
{
// move the whole table
SwNodeRange aRg( *pTblNd, 0, *pTblNd->EndOfSectionNode(), 1 );
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index e325c26..ede8835 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -844,7 +844,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
// Special case: If a Box is located in a Table, copy it to all selected
// Boxes!
- if( 1 != rCpyTbl.GetTabSortBoxes().Count() )
+ if( 1 != rCpyTbl.GetTabSortBoxes().size() )
{
SwTableLine* pSttLine = pSttBox->GetUpper();
sal_uInt16 nSttLine = GetTabLines().C40_GETPOS( SwTableLine, pSttLine );
@@ -1008,7 +1008,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
aFndBox.SetTableLines( *this );
aFndBox.DelFrms( *this );
- if( 1 == rCpyTbl.GetTabSortBoxes().Count() )
+ if( 1 == rCpyTbl.GetTabSortBoxes().size() )
{
SwTableBox *pTmpBx = rCpyTbl.GetTabSortBoxes()[0];
for( sal_uInt16 n = 0; n < rSelBoxes.Count(); ++n )
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 505eeab..3b66da5 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -3523,7 +3523,7 @@ _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo,
}
// Prevent deleting the whole Table
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list