[Libreoffice-commits] .: 3 commits - cui/source editeng/source fpicker/source idl/inc sc/source sfx2/inc sfx2/source svl/source svtools/source svx/inc svx/source sw/inc sw/source xmloff/source
August Sodora
augsod at kemper.freedesktop.org
Tue Jan 10 20:18:38 PST 2012
cui/source/customize/cfgutil.cxx | 2 -
cui/source/customize/macropg.cxx | 1
cui/source/customize/selector.cxx | 1
cui/source/dialogs/insdlg.cxx | 2 -
cui/source/dialogs/linkdlg.cxx | 1
cui/source/inc/acccfg.hxx | 6 ----
cui/source/inc/cfgutil.hxx | 3 --
cui/source/inc/cuifmsearch.hxx | 6 ----
cui/source/inc/cuisrchdlg.hxx | 4 --
cui/source/tabpages/autocdlg.cxx | 3 --
cui/source/tabpages/macroass.cxx | 2 -
cui/source/tabpages/numfmt.cxx | 2 -
editeng/source/misc/SvXMLAutoCorrectExport.cxx | 3 --
editeng/source/misc/SvXMLAutoCorrectImport.cxx | 4 --
editeng/source/misc/svxacorr.cxx | 36 +++++++++----------------
fpicker/source/odma/ODMAFolderPicker.cxx | 3 --
fpicker/source/office/OfficeFilePicker.cxx | 1
fpicker/source/office/OfficeFolderPicker.cxx | 3 --
fpicker/source/office/iodlg.cxx | 5 ---
fpicker/source/office/iodlgimp.cxx | 7 ----
idl/inc/object.hxx | 1
sc/source/core/data/documen8.cxx | 3 --
sc/source/filter/excel/excrecds.cxx | 6 ----
sc/source/filter/html/htmlexp.cxx | 8 -----
sc/source/ui/inc/acredlin.hxx | 7 ----
sfx2/inc/sfx2/appuno.hxx | 18 ------------
sfx2/source/appl/app.cxx | 3 --
sfx2/source/appl/appopen.cxx | 2 -
sfx2/source/appl/linkmgr2.cxx | 3 --
sfx2/source/appl/sfxhelp.cxx | 3 --
sfx2/source/dialog/filedlgimpl.hxx | 3 --
sfx2/source/dialog/templdlg.cxx | 3 --
sfx2/source/dialog/versdlg.cxx | 2 -
sfx2/source/doc/docfile.cxx | 2 -
sfx2/source/doc/docinsert.cxx | 3 --
sfx2/source/doc/docvor.cxx | 1
sfx2/source/menu/mnumgr.cxx | 2 -
svl/source/items/style.cxx | 5 ---
svl/source/memtools/svarray.cxx | 15 ----------
svl/source/misc/inettype.cxx | 6 ----
svl/source/numbers/zforlist.cxx | 2 -
svtools/source/control/inettbc.cxx | 3 --
svtools/source/svrtf/svparser.cxx | 2 -
svx/inc/svx/fmsearch.hxx | 6 ----
svx/inc/svx/srchdlg.hxx | 7 ----
svx/source/dialog/fntctrl.cxx | 7 ----
svx/source/fmcomp/fmgridcl.cxx | 7 ----
svx/source/form/fmexch.cxx | 1
svx/source/inc/fmshimp.hxx | 2 -
svx/source/items/clipfmtitem.cxx | 3 --
svx/source/items/numfmtsh.cxx | 3 --
sw/inc/acmplwrd.hxx | 2 -
sw/inc/doc.hxx | 1
sw/inc/docstyle.hxx | 3 --
sw/inc/shellres.hxx | 6 ----
sw/source/core/doc/SwStyleNameMapper.cxx | 3 --
sw/source/core/doc/docfld.cxx | 4 --
sw/source/core/doc/doctxm.cxx | 3 --
sw/source/core/edit/edtab.cxx | 2 -
sw/source/core/fields/authfld.cxx | 5 ---
sw/source/core/inc/UndoAttribute.hxx | 5 ---
sw/source/core/inc/scriptinfo.hxx | 5 ---
sw/source/core/inc/swcache.hxx | 5 ---
sw/source/core/layout/dbg_lay.cxx | 6 ----
sw/source/core/layout/layhelp.hxx | 4 --
sw/source/core/sw3io/sw3convert.cxx | 7 ----
sw/source/core/text/itratr.hxx | 2 -
sw/source/core/txtnode/atrftn.cxx | 4 --
sw/source/core/txtnode/ndtxt.cxx | 2 -
sw/source/core/unocore/unocrsrhelper.cxx | 2 -
sw/source/core/unocore/unoobj.cxx | 2 -
sw/source/core/unocore/unoobj2.cxx | 3 --
sw/source/core/unocore/unoparagraph.cxx | 2 -
sw/source/filter/ascii/ascatr.cxx | 3 --
sw/source/filter/html/htmlatr.cxx | 7 ----
sw/source/filter/html/htmlbas.cxx | 2 -
sw/source/filter/html/htmlplug.cxx | 1
sw/source/filter/html/svxcss1.hxx | 5 ---
sw/source/filter/html/swhtml.hxx | 9 ------
sw/source/filter/html/wrthtml.hxx | 2 -
sw/source/filter/writer/writer.cxx | 2 -
sw/source/filter/ww8/wrtw8esh.cxx | 2 -
sw/source/filter/xml/xmlexpit.cxx | 8 -----
sw/source/filter/xml/xmlfmt.cxx | 6 ----
sw/source/filter/xml/xmltbli.hxx | 5 ---
sw/source/filter/xml/xmltexte.cxx | 3 --
sw/source/ui/app/apphdl.cxx | 3 --
sw/source/ui/app/appopt.cxx | 1
sw/source/ui/chrdlg/drpcps.cxx | 3 --
sw/source/ui/chrdlg/pardlg.cxx | 7 ----
sw/source/ui/config/optpage.cxx | 5 ---
sw/source/ui/dbui/dbmgr.cxx | 1
sw/source/ui/dbui/mmconfigitem.cxx | 3 --
sw/source/ui/dialog/macassgn.cxx | 3 --
sw/source/ui/fmtui/tmpdlg.cxx | 5 ---
sw/source/ui/inc/basesh.hxx | 2 -
sw/source/ui/inc/edtwin.hxx | 1
sw/source/ui/inc/fldmgr.hxx | 4 --
sw/source/ui/inc/label.hxx | 3 --
sw/source/ui/index/idxmrk.cxx | 3 --
sw/source/ui/index/swuiidxmrk.cxx | 1
sw/source/ui/lingu/olmenu.cxx | 5 ---
sw/source/ui/misc/glossary.cxx | 1
sw/source/ui/misc/redlndlg.cxx | 6 ----
sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 6 ----
sw/source/ui/shells/grfshex.cxx | 3 --
sw/source/ui/uiview/view2.cxx | 4 --
sw/source/ui/uiview/viewling.cxx | 5 ---
sw/source/ui/uiview/viewprt.cxx | 8 -----
sw/source/ui/utlui/bookctrl.cxx | 4 --
sw/source/ui/utlui/content.cxx | 4 --
sw/source/ui/utlui/glbltree.cxx | 4 --
sw/source/ui/utlui/gloslst.cxx | 5 ---
sw/source/ui/wrtsh/wrtundo.cxx | 4 --
xmloff/source/style/styleexp.cxx | 3 --
xmloff/source/style/xmlnumfe.cxx | 4 --
xmloff/source/style/xmlnumi.cxx | 3 --
xmloff/source/style/xmltabi.cxx | 7 ----
xmloff/source/text/XMLTextColumnsContext.cxx | 1
xmloff/source/text/txtimp.cxx | 3 --
120 files changed, 19 insertions(+), 473 deletions(-)
New commits:
commit bcb9ddaa7ea954cebaa031dc74cf7cd21489d8d6
Author: August Sodora <augsod at gmail.com>
Date: Mon Jan 9 20:37:49 2012 -0500
Remove _SVSTDARR_STRINGSISORTDTOR
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 0c45efb..f5fb4a8 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -67,8 +67,6 @@
#include <unotools/configmgr.hxx>
#include "dialmgr.hxx"
#include <svl/stritem.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
using namespace ::com::sun::star;
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 367fc67..7a29e06 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -30,7 +30,6 @@
#include "macropg.hxx"
#include <vcl/msgbox.hxx>
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx>
#include <svl/eitem.hxx>
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index d5beb56..2f624e2 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;
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <svtools/imagemgr.hxx>
#include <tools/urlobj.hxx>
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 06f5777..5312e6f 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -76,10 +76,8 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::ui::dialogs;
using ::rtl::OUString;
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-
static String impl_getSvtResString( sal_uInt32 nId )
{
String aRet;
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 9d9b2ce..42b9080 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -51,7 +51,6 @@
#include <dialmgr.hxx>
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#define MAX_FILENAME 18
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 4169fed..7a6eb25 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -52,16 +52,10 @@
#include <svtools/svtreebx.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/basedlgs.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-
#include <sfx2/minarray.hxx>
-
#include "cfgutil.hxx"
-// class SfxAcceleratorConfigListBox *************************************************
-
#define css ::com::sun::star
class SfxMacroInfoItem;
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 81e2235..c4fe5c9 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -37,10 +37,7 @@
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/script/browse/XBrowseNode.hpp>
-
-#define _SVSTDARR_STRINGSDTOR
#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 68ebcc3..218a56f 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -32,16 +32,10 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <svx/fmsearch.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-
#include <vcl/dialog.hxx>
-
#include <vcl/button.hxx>
-
#include <vcl/fixed.hxx>
-
#include <vcl/edit.hxx>
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index f1bf397..434b3ab 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -28,9 +28,6 @@
#ifndef _CUI_SRCHDLG_HXX
#define _CUI_SRCHDLG_HXX
-// include ---------------------------------------------------------------
-
-
#include <svtools/stdctrl.hxx>
#include <vcl/combobox.hxx>
#include <vcl/edit.hxx>
@@ -42,7 +39,6 @@
#include <sfx2/childwin.hxx>
#include <sfx2/basedlgs.hxx>
#include <svl/svarray.hxx>
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx>
#include <svl/srchdefs.hxx>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index f1731e9..a532f16 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-#define _SVSTDARR_STRINGSISORTDTOR
-#define _SVSTDARR_STRINGSDTOR
-
#include <svl/svstdarr.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/field.hxx>
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index b160def..abd7123 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -36,9 +36,7 @@
#include <comphelper/string.hxx>
#include <dialmgr.hxx>
#include <svx/dialogs.hrc>
-#define _SVSTDARR_STRINGSDTOR
#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 17b2fbf..be12b14 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-// include ---------------------------------------------------------------
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <sfx2/objsh.hxx>
@@ -34,7 +33,6 @@
#include <unotools/localedatawrapper.hxx>
#include <i18npool/lang.h>
#include <svx/dialogs.hrc>
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <svtools/colorcfg.hxx>
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
index 0723a74..8538f87 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
@@ -26,12 +26,9 @@
*
************************************************************************/
-
#include <SvXMLAutoCorrectExport.hxx>
#include <com/sun/star/util/MeasureUnit.hpp>
-#define _SVSTDARR_STRINGSISORTDTOR
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <xmloff/xmltoken.hxx>
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index f001454..e7354b9 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -28,9 +28,6 @@
#include <SvXMLAutoCorrectImport.hxx>
#include <vcl/svapp.hxx>
-
-#define _SVSTDARR_STRINGSISORTDTOR
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <xmloff/xmltoken.hxx>
@@ -38,7 +35,6 @@ using namespace ::com::sun::star;
using namespace ::xmloff::token;
using namespace ::rtl;
-
static OUString sBlockList ( RTL_CONSTASCII_USTRINGPARAM ( "_block-list" ) );
SvXMLAutoCorrectImport::SvXMLAutoCorrectImport(
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 978c9ab..b7df997 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <tools/urlobj.hxx>
@@ -35,9 +33,6 @@
#include <i18npool/mslangid.hxx>
#include <vcl/svapp.hxx>
#include <sot/storinfo.hxx>
-// for the Sort-String-Arrays from SVMEM.HXX
-#define _SVSTDARR_STRINGSISORTDTOR
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <svl/fstathelper.hxx>
#include <svtools/helpopt.hxx>
diff --git a/fpicker/source/odma/ODMAFolderPicker.cxx b/fpicker/source/odma/ODMAFolderPicker.cxx
index 097e2f9..c5eb9a8 100644
--- a/fpicker/source/odma/ODMAFolderPicker.cxx
+++ b/fpicker/source/odma/ODMAFolderPicker.cxx
@@ -27,12 +27,9 @@
*
************************************************************************/
-
#include "ODMAFolderPicker.hxx"
-#define _SVSTDARR_STRINGSDTOR
#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 3df9f11..a6d3da9 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -41,7 +41,6 @@
#endif
#include <tools/urlobj.hxx>
#include <tools/debug.hxx>
-#define _SVSTDARR_STRINGSDTOR
#include "svl/svstdarr.hxx"
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index 74dd316..cc7a6b3 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -26,15 +26,12 @@
*
************************************************************************/
-
#include "OfficeFolderPicker.hxx"
#include "iodlg.hxx"
#include <list>
#include <tools/urlobj.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#include "svl/svstdarr.hxx"
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
#include <com/sun/star/container/XSet.hpp>
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 2db644b..226eaf0 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-// includes --------------------------------------------------------------
#include <sal/macros.h>
#include "iodlg.hxx"
#include <tools/stream.hxx>
@@ -48,9 +46,6 @@
#include "svtools/sfxecode.hxx"
#include "svl/svarray.hxx"
#include "svtools/svtabbx.hxx"
-
-#define _SVSTDARR_USHORTS
-#define _SVSTDARR_STRINGSDTOR
#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 5e02c2d..2fabd62 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-// includes *******************************************************************
-
#include "iodlgimp.hxx"
#include "svtools/headbar.hxx"
#include <tools/debug.hxx>
@@ -50,10 +47,6 @@
#include "unotools/useroptions.hxx"
#include "rtl/instance.hxx"
#include <svl/svl.hrc>
-
-#define _SVSTDARR_STRINGSSORTDTOR
-#define _SVSTDARR_STRINGSDTOR
-#define _SVSTDARR_USHORTS
#include "svl/svstdarr.hxx"
using namespace ::com::sun::star::uno;
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index bf04989..6690f82 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -29,7 +29,6 @@
#ifndef _OBJECT_HXX
#define _OBJECT_HXX
-#define _SVSTDARR_ULONGS
#include <types.hxx>
#include <slot.hxx>
#include <vector>
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index cb1bd7d..3e32e82 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
@@ -47,7 +45,6 @@
#include <sfx2/viewsh.hxx>
#include <svl/flagitem.hxx>
#include <svl/intitem.hxx>
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index ebd2b4e..828b2d6 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -26,11 +26,6 @@
*
************************************************************************/
-
-
-
-//------------------------------------------------------------------------
-
#include "excrecds.hxx"
#include <map>
@@ -63,7 +58,6 @@
#include <svl/zformat.hxx>
#include <svtools/ctrltool.hxx>
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#include <string.h>
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index ec550e2..af34e40 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -26,11 +26,6 @@
*
************************************************************************/
-
-
-
-// INCLUDE ---------------------------------------------------------------
-
#include "scitems.hxx"
#include <comphelper/string.hxx>
#include <editeng/eeitem.hxx>
@@ -56,9 +51,6 @@
#include <sfx2/objsh.hxx>
#include <svl/stritem.hxx>
#include <svl/urihelper.hxx>
-#ifndef _SVSTDARR_STRINGSSORTDTOR
-#define _SVSTDARR_STRINGSSORTDTOR
-#endif
#include <svl/svstdarr.hxx>
#include <svl/zforlist.hxx>
#include <svtools/htmlkywd.hxx>
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 417ed14..b1d183a 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -34,19 +34,12 @@
#include <vcl/group.hxx>
#include <svtools/headbar.hxx>
#include <svtools/svtabbx.hxx>
-
-
#include "rangenam.hxx"
#include "anyrefdg.hxx"
#include <vcl/lstbox.hxx>
-
#include <svx/ctredlin.hxx>
#include <svx/simptabl.hxx>
-
-#ifndef _SVARRAY_HXX
-#define _SVARRAY_HXX
#include <svl/svarray.hxx>
-#endif
#include "chgtrack.hxx"
#include "chgviset.hxx"
#include <vcl/timer.hxx>
diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx
index 9c5727e..00e8129 100644
--- a/sfx2/inc/sfx2/appuno.hxx
+++ b/sfx2/inc/sfx2/appuno.hxx
@@ -28,10 +28,6 @@
#ifndef _SFX_APPUNO_HXX
#define _SFX_APPUNO_HXX
-//____________________________________________________________________________________________________________________________________
-// generated header
-//____________________________________________________________________________________________________________________________________
-
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -50,31 +46,17 @@
#include <com/sun/star/frame/XDispatchInformationProvider.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-//____________________________________________________________________________________________________________________________________
-// fix uno header
-//____________________________________________________________________________________________________________________________________
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase4.hxx>
-//____________________________________________________________________________________________________________________________________
-// something else header
-//____________________________________________________________________________________________________________________________________
#include <tools/errcode.hxx>
#include <svl/svarray.hxx>
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <sfx2/sfxuno.hxx>
-//____________________________________________________________________________________________________________________________________
-// forwards
-//____________________________________________________________________________________________________________________________________
-
-//____________________________________________________________________________________________________________________________________
-// declarations
-//____________________________________________________________________________________________________________________________________
class SfxObjectShell;
class SfxMacroLoader : public ::com::sun::star::frame::XDispatchProvider,
public ::com::sun::star::frame::XNotifyingDispatch,
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index d3f134d..4931518 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -50,10 +50,7 @@
#include <svl/svdde.hxx>
#include <unotools/tempfile.hxx>
#include <osl/file.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#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 e60c108..7bb7a5c 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -107,8 +107,6 @@
#include <sfx2/filedlghelper.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/event.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
using namespace ::com::sun::star;
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 1f48420..b7c5f2a 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <sfx2/linkmgr.hxx>
#include <com/sun/star/document/UpdateDocMode.hpp>
#include <sfx2/objsh.hxx>
@@ -50,8 +49,6 @@
#include "impldde.hxx"
#include "app.hrc"
#include "sfx2/sfxresid.hxx"
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <com/sun/star/lang/XComponent.hpp>
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 32a542d..0dd391c 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "sfx2/sfxhelp.hxx"
#include <set>
@@ -65,8 +64,6 @@
#include <vcl/msgbox.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include "newhelp.hxx"
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 6770bb7..1da12fb 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -37,10 +37,7 @@
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
#include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp>
#include <sfx2/fcontnr.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#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 675b153..4e60a86 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
@@ -34,8 +33,6 @@
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
#include <svl/style.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx>
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 8c5d14d..f6ae242 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -36,8 +36,6 @@
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <tools/datetime.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include "versdlg.hrc"
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 2183883..af69158 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -89,8 +89,6 @@
#include <svtools/svparser.hxx> // SvKeyValue
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/implbase1.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <unotools/streamwrap.hxx>
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index ec22501..c103116 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <sfx2/app.hxx>
#include "sfx2/docinsert.hxx"
#include <sfx2/docfile.hxx>
@@ -48,8 +47,6 @@
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
using namespace ::com::sun::star;
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index ef88238..c0f9390 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -72,7 +72,6 @@
#include <svtools/localresaccess.hxx>
#include <svtools/addresstemplate.hxx>
#include <comphelper/processfactory.hxx>
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
static const char cDelim = ':';
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 5678123..e9d7cf8 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <com/sun/star/embed/VerbDescriptor.hpp>
#include <com/sun/star/embed/VerbAttributes.hpp>
#include <com/sun/star/container/XNamed.hpp>
@@ -57,7 +56,6 @@
#include <sfx2/mnumgr.hxx>
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#include <svtools/menuoptions.hxx>
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 337af7c..02ed772 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -26,13 +26,8 @@
*
************************************************************************/
-
#include <com/sun/star/lang/XComponent.hpp>
-#define _SVSTDARR_STRINGSSORTDTOR
-#define _SVSTDARR_BYTESTRINGS
-#define _SVSTDARR_BYTESTRINGSSORTDTOR
-
#include <tools/tenccvt.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/intlwrapper.hxx>
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index e49af56..52f3f0c 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -26,24 +26,9 @@
*
************************************************************************/
-
-#define _SVARRAY_CXX
-
-#define _SVSTDARR_sal_uInt16S
#define _SVSTDARR_STRINGSDTOR
-#define _SVSTDARR_STRINGSSORT
#define _SVSTDARR_STRINGSSORTDTOR
#define _SVSTDARR_STRINGSISORT
-#define _SVSTDARR_STRINGSISORTDTOR
-
-#define _SVSTDARR_BYTESTRINGS
-#define _SVSTDARR_BYTESTRINGSDTOR
-#define _SVSTDARR_BYTESTRINGSSORT
-#define _SVSTDARR_BYTESTRINGSSORTDTOR
-#define _SVSTDARR_BYTESTRINGSISORT
-#define _SVSTDARR_BYTESTRINGSISORTDTOR
-
-#define _SVSTDARR_XUB_STRLEN
#include <svl/svstdarr.hxx>
#include <tools/debug.hxx>
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index b043f06..c68e528 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -36,12 +36,6 @@
#include "getstringresource.hxx"
-#ifndef _SVSTDARR_STRINGSSORT_DECL
-#define _SVSTDARR_STRINGSSORT
-#include <svl/svstdarr.hxx>
-#undef _SVSTDARR_STRINGSSORT
-#endif
-
namespace
{
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 908b437..3aff518 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <tools/debug.hxx>
#include <unotools/charclass.hxx>
#include <i18npool/mslangid.hxx>
@@ -38,7 +37,6 @@
#include <comphelper/processfactory.hxx>
#include <unotools/misccfg.hxx>
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#define _ZFORLIST_CXX
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 39461a6..b9b526c 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#ifdef UNX
#include <pwd.h>
#include <sys/types.h>
@@ -57,8 +56,6 @@
#include <svl/itemset.hxx>
#include "svl/urihelper.hxx"
#include <unotools/pathoptions.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <ucbhelper/commandenvironment.hxx>
#include <ucbhelper/content.hxx>
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 42c07d8..6cacb7f 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -26,12 +26,10 @@
*
************************************************************************/
-
#include <stdio.h>
#include <svtools/svparser.hxx>
#include <tools/stream.hxx>
#include <tools/debug.hxx>
-#define _SVSTDARR_USHORTS
#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 0e23fb0..2affd50 100644
--- a/svx/inc/svx/fmsearch.hxx
+++ b/svx/inc/svx/fmsearch.hxx
@@ -30,16 +30,10 @@
#define _FMSEARCH_HXX
#include <com/sun/star/sdbc/XResultSet.hpp>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-
#include <vcl/dialog.hxx>
-
#include <vcl/button.hxx>
-
#include <vcl/fixed.hxx>
-
#include <vcl/edit.hxx>
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index b15e3c6..ad2cea4 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -28,9 +28,6 @@
#ifndef _SVX_SRCHDLG_HXX
#define _SVX_SRCHDLG_HXX
-// include ---------------------------------------------------------------
-
-
#include <svtools/stdctrl.hxx>
#include <vcl/combobox.hxx>
#include <vcl/edit.hxx>
@@ -42,15 +39,11 @@
#include <sfx2/childwin.hxx>
#include <sfx2/basedlgs.hxx>
#include <svl/svarray.hxx>
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx>
#include <svl/srchdefs.hxx>
#include "svx/svxdllapi.h"
-
-// forward ---------------------------------------------------------------
-
class SvxSearchItem;
class MoreButton;
class SfxStyleSheetBasePool;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 8ba8815..2dc1930 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-// include ---------------------------------------------------------------
#include <sfx2/viewsh.hxx> // SfxViewShell
#include <sfx2/printer.hxx> // Printer
#include <vcl/metric.hxx>
@@ -40,10 +38,6 @@
#include <com/sun/star/i18n/ScriptType.hdl>
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_XUB_STRLEN
-#include <svl/svstdarr.hxx>
-#endif
#include <vector>
#include <svtools/colorcfg.hxx>
#include <svtools/sampletext.hxx>
@@ -57,6 +51,7 @@
#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>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 9e70e62..ec44cf1 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "svx/dbexch.hrc"
#include "svx/fmgridif.hxx"
#include "fmitems.hxx"
@@ -63,13 +62,7 @@
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-
-#ifndef _SVSTDARR_STRINGSDTOR
-#define _SVSTDARR_STRINGSDTOR
-#define _SVSTDARR_ULONGS
#include <svl/svstdarr.hxx>
-#endif
-
#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 7b62037..6d48d04 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -36,7 +36,6 @@
#include <svtools/svtreebx.hxx>
#include <tools/diagnose_ex.h>
-#define _SVSTDARR_ULONGS
#include <svl/svstdarr.hxx>
//........................................................................
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index a3598f7..152997a 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -56,8 +56,6 @@
#include <svl/svarray.hxx>
#include <svl/lstner.hxx>
-#define _SVSTDARR_ULONGS
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#include <sfx2/mnuitem.hxx>
#include "svx/fmtools.hxx"
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index 7f37e43..2dd89e2 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-#define _SVSTDARR_STRINGSDTOR
-
#include <svl/svstdarr.hxx>
#include <svx/clipfmtitem.hxx>
#include <com/sun/star/frame/status/ClipboardFormats.hpp>
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index a6b1402..9736e97 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -26,12 +26,9 @@
*
************************************************************************/
-
-// include ---------------------------------------------------------------
#include <tools/color.hxx>
#define _SVX_NUMFMTSH_CXX
-#define _SVSTDARR_STRINGSDTOR
#include <tools/debug.hxx>
#include <i18npool/mslangid.hxx>
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index ad7a0de..c51bb80 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -28,8 +28,6 @@
#ifndef _ACMPLWRD_HXX
#define _ACMPLWRD_HXX
-
-#define _SVSTDARR_STRINGSISORTDTOR
#include <svl/svstdarr.hxx>
class SwDoc;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 9fdbb06..11f8cd8 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -53,7 +53,6 @@
class SwList;
#include <IDocumentExternalData.hxx>
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/XStorage.hpp>
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 620074a..4c64bb6 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -30,10 +30,7 @@
#include <rtl/ref.hxx>
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#endif
#include <svl/style.hxx>
#include <svl/itemset.hxx>
#include "swdllapi.h"
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index dcf7137..2c7ccc2 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -28,15 +28,9 @@
#ifndef _SHELLRES_HXX
#define _SHELLRES_HXX
-
#include <tools/string.hxx>
-
#include <vcl/bitmap.hxx>
-
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#endif
struct SW_DLLPUBLIC ShellResource : public Resource
{
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index 2d968ad..df33c4f 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -26,10 +26,7 @@
*
************************************************************************/
-
-
#include <SwStyleNameMapper.hxx>
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <tools/resmgr.hxx>
#include <poolfmt.hxx>
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 8d30248..670190f 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -26,16 +26,12 @@
*
************************************************************************/
-
-
#include <hintids.hxx>
#include <string.h>
#include <float.h>
#include <tools/datetime.hxx>
-#ifndef _SVSTDARR_HXX
#include <svl/svarray.hxx>
-#endif
#include <vcl/svapp.hxx>
#include <unotools/charclass.hxx>
#include <unotools/transliterationwrapper.hxx>
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index c888853..4471457 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -26,12 +26,9 @@
*
************************************************************************/
-
-
#include <limits.h>
#include <hintids.hxx>
#include <comphelper/string.hxx>
-#define _SVSTDARR_STRINGSSORT
#include <svl/svstdarr.hxx>
#include <editeng/langitem.hxx>
#include <editeng/brkitem.hxx>
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 863b75b..f97f26a 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -26,12 +26,10 @@
*
************************************************************************/
-
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <hintids.hxx>
#include <hints.hxx>
-#define _SVSTDARR_ULONGS
#include <svl/svstdarr.hxx>
#include <vcl/svapp.hxx>
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 2d411d3..718e963 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -26,11 +26,6 @@
*
************************************************************************/
-
-
-#define _SVSTDARR_STRINGSDTOR
-#define _SVSTDARR_USHORTS
-#define _SVSTDARR_ULONGS
#include <hintids.hxx>
#include <svl/svstdarr.hxx>
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index 9a5541c..8c2f4c2 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -33,11 +33,6 @@
#include <memory>
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_USHORTS
-#define _SVSTDARR_ULONGS
-#include <svl/svstdarr.hxx>
-#endif
#include <svl/itemset.hxx>
#include <swtypes.hxx>
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index a89d8b8..aa636fc 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -27,11 +27,8 @@
************************************************************************/
#ifndef _SCRIPTINFO_HXX
#define _SCRIPTINFO_HXX
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_USHORTS
-#define _SVSTDARR_XUB_STRLEN
+
#include <svl/svstdarr.hxx>
-#endif
#include <list>
#include "swscanner.hxx"
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 92cb1a9..1341175 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -28,8 +28,6 @@
#ifndef _SWCACHE_HXX
#define _SWCACHE_HXX
-
-
/*
* Es werden Pointer auf Objekte verwaltet. Diese werden in einem einfachen
* PtrArray verwaltet.
@@ -59,10 +57,7 @@
*/
#include <vector>
-
-#ifndef _SVSTDARR_HXX
#include <svl/svstdarr.hxx>
-#endif
class SwCacheObj;
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 7f5f122..87f6d83 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#ifdef DBG_UTIL
/*
@@ -107,11 +106,6 @@
#include "dbg_lay.hxx"
#include <tools/stream.hxx>
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_USHORTS
-#include <svl/svstdarr.hxx>
-#endif
-
#include <stdio.h>
#include "frame.hxx"
diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx
index 1620686..6028735 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -27,10 +27,8 @@
************************************************************************/
#ifndef _LAYHELP_HXX
#define _LAYHELP_HXX
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_XUB_STRLEN
+
#include <svl/svstdarr.hxx>
-#endif
#include <swrect.hxx>
#include <vector>
diff --git a/sw/source/core/sw3io/sw3convert.cxx b/sw/source/core/sw3io/sw3convert.cxx
index 2a08eec..3416d88 100644
--- a/sw/source/core/sw3io/sw3convert.cxx
+++ b/sw/source/core/sw3io/sw3convert.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-
-
#include <stdlib.h>
#include <stdio.h>
@@ -40,10 +37,6 @@
#include <svl/urihelper.hxx>
#include <sfx2/linkmgr.hxx>
-#ifndef _SVSTDARR_USHORTS_DECL
-#define _SVSTDARR_USHORTS
-#include <svl/svstdarr.hxx>
-#endif
#include <editeng/lrspitem.hxx>
#include <editeng/tstpitem.hxx>
#include <fmtinfmt.hxx>
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index a5cc8cc..d850112 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -33,8 +33,6 @@
#include "swfont.hxx"
#include "porlay.hxx"
-#define _SVSTDARR_XUB_STRLEN
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
class OutputDevice;
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index 9afeab4..0a21161 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -26,10 +26,6 @@
*
************************************************************************/
-
-
-
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#include <doc.hxx>
#include <cntfrm.hxx> // OSL_ENSURE(in ~SwTxtFtn()
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 19a968d..42220eb 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -36,9 +36,7 @@
#include <editeng/rsiditem.hxx>
#include <editeng/tstpitem.hxx>
#include <svl/urihelper.hxx>
-#ifndef _SVSTDARR_HXX
#include <svl/svstdarr.hxx>
-#endif
#include <svl/ctloptions.hxx>
#include <swmodule.hxx>
#include <txtfld.hxx>
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 92fd642..47be88b 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <svx/svxids.hrc>
#include <map>
#include <com/sun/star/text/XTextSection.hpp>
@@ -68,7 +67,6 @@
#include <editeng/flstitem.hxx>
#include <vcl/metric.hxx>
#include <svtools/ctrltool.hxx>
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index b4ea3fc..e387015 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <com/sun/star/table/TableSortField.hpp>
#include <osl/endian.h>
@@ -107,7 +106,6 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <fmtflcnt.hxx>
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#include <editeng/brshitem.hxx>
#include <editeng/unolingu.hxx>
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 5f3adcb..6d6f3c1 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <rtl/ustrbuf.hxx>
#include <swtypes.hxx>
#include <hintids.hxx>
@@ -106,8 +105,6 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <fmtflcnt.hxx>
-#define _SVSTDARR_USHORTS
-#define _SVSTDARR_XUB_STRLEN
#include <svl/svstdarr.hxx>
#include <editeng/brshitem.hxx>
#include <fmtclds.hxx>
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 0f8a412..a9cbe42 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <unoparagraph.hxx>
#include <cmdid.h>
#include <unomid.h>
@@ -44,7 +43,6 @@
#include <vcl/svapp.hxx>
#include <docsh.hxx>
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#include <com/sun/star/beans/SetPropertyTolerantFailed.hpp>
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index e5995f2..9682ada 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -29,10 +29,7 @@
#include <hintids.hxx>
#include <tools/stream.hxx>
#include <comphelper/string.hxx>
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
-#endif
#include <editeng/fontitem.hxx>
#include <pam.hxx>
#include <doc.hxx>
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 705821e..97087f5 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -26,18 +26,11 @@
*
************************************************************************/
-
-
#include <hintids.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
#include <sfx2/sfx.hrc>
-#if !defined _SVSTDARR_XUB_STRLEN_DECL || !defined _SVSTDARR_USHORTS_DECL
-#define _SVSTDARR_XUB_STRLEN
-#define _SVSTDARR_USHORTS
-#include <svl/svstdarr.hxx>
-#endif
#include <svtools/htmlout.hxx>
#include <svtools/htmlkywd.hxx>
#include <svtools/htmltokn.h>
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index fe29982..b3a664f 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -26,11 +26,9 @@
*
************************************************************************/
-
#include <hintids.hxx>
#include <rtl/strbuf.hxx>
#include <sfx2/sfx.hrc>
-#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx>
#include <basic/sbx.hxx>
#include <basic/basmgr.hxx>
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index d5c2d5f..cb3692b 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>
-#define _SVSTDARR_ULONGS
#include <svl/svstdarr.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/frmhtml.hxx>
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 1512fd7..d8049ae 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -31,11 +31,6 @@
#include <tools/string.hxx>
#include <svl/itemset.hxx>
#include <editeng/svxenum.hxx>
-
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_USHORTS
-#include <svl/svstdarr.hxx>
-#endif
#include <rtl/textenc.h>
#include "parcss1.hxx"
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 45b8b7d..2343257 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -28,16 +28,7 @@
#ifndef _SWHTML_HXX
#define _SWHTML_HXX
-#if !defined(_SVSTDARR_XUB_STRLEN_DECL) || \
- !defined(_SVSTDARR_USHORTS_DECL) || !defined(_SVSTDARR_STRINGSDTOR_DECL)
-#ifndef _SVSTDARR_XUB_STRLEN_DECL
-#define _SVSTDARR_XUB_STRLEN
-#endif
-#ifndef _SVSTDARR_STRINGSDTOR_DECL
-#define _SVSTDARR_STRINGSDTOR
-#endif
#include <svl/svstdarr.hxx>
-#endif
#include <sfx2/sfxhtml.hxx>
#include <svl/macitem.hxx>
#include <editeng/svxenum.hxx>
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 5f9753e..71082c7 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -34,8 +34,6 @@
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <vcl/field.hxx>
-#define _SVSTDARR_STRINGSDTOR
-#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx>
#include <i18npool/lang.h>
#include <tools/stream.hxx>
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index 1d02801..4f5cac8 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -26,10 +26,8 @@
*
************************************************************************/
-
#include <hintids.hxx>
-#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx>
#include <tools/table.hxx>
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 5529449..3d3cc83 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -28,10 +28,8 @@
#include <com/sun/star/embed/Aspects.hpp>
-
#include <hintids.hxx>
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/virdev.hxx>
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index ebe9799..f1afbd0 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "xmlexpit.hxx"
#include <rtl/ustrbuf.hxx>
@@ -41,13 +40,6 @@
#include <editeng/xmlcnitm.hxx>
#include <xmloff/xmlexp.hxx>
#include <editeng/memberids.hrc>
-
-#ifndef _SVSTDARR_USHORTS
-#define _SVSTDARR_USHORTS
-#include <svl/svstdarr.hxx>
-#endif
-
-
#include "hintids.hxx"
#include "unomid.h"
#include <svx/unomid.hxx>
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 9b6d281..8320b91 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -26,14 +26,8 @@
*
************************************************************************/
-
-
#include <rtl/ustrbuf.hxx>
-#ifndef _SVSTDARR_STRINGSSORT_DECL
-#define _SVSTDARR_STRINGSSORT
-#include <svl/svstdarr.hxx>
-#endif
#include <xmloff/nmspmap.hxx>
#include <format.hxx>
#include <fmtcol.hxx>
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index 4d6d2cf..ea94139 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -34,12 +34,7 @@
// STL include
#include <boost/unordered_map.hpp>
#include <vector>
-
-#if !defined(_SVSTDARR_USHORTS_DECL) || !defined(_SVSTDARR_STRINGSDTOR_DECL)
-#define _SVSTDARR_USHORTS
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#endif
class SwXMLImport;
class SwTableNode;
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 0835c08..2dc565c 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <sot/clsids.hxx>
#include <com/sun/star/embed/XEmbedObjectCreator.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
@@ -52,13 +51,11 @@
#include "xmltexte.hxx"
#include <SwAppletImpl.hxx>
-#define _SVSTDARR_ULONGS
#include <svl/svstdarr.hxx>
#include "svl/urihelper.hxx"
#include <sfx2/frmdescr.hxx>
#include <SwStyleNameMapper.hxx>
-
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 63cb333..a0cc954 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -26,13 +26,10 @@
*
************************************************************************/
-
#include <hintids.hxx>
#include <osl/diagnose.h>
#include <tools/link.hxx>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <svl/urihelper.hxx>
#include <unotools/undoopt.hxx>
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index db0f26d..3a31f34 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -28,7 +28,6 @@
#include <cmdid.h> // Function-Ids
-#define _SVSTDARR_STRINGSDTOR
#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 d1ac824..9d46799 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -31,9 +31,6 @@
#endif
#include <hintids.hxx>
-#define _SVSTDARR_STRINGSDTOR
-#define _SVSTDARR_STRINGSISORTDTOR
-#define _SVSTDARR_XUB_STRLEN
#include <svl/svstdarr.hxx>
#include "cmdid.h"
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 938ee6a..50b6196 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -26,22 +26,15 @@
*
************************************************************************/
-
#ifdef SW_DLLIMPLEMENTATION
#undef SW_DLLIMPLEMENTATION
#endif
-
#include "hintids.hxx"
#include <svx/htmlmode.hxx>
#include <svl/style.hxx>
-
#include <svtools/htmlcfg.hxx>
-
-#ifndef _SVSTDARR_STRINGSSORTDTOR
-#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx>
-#endif
#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 231d7bf..e41c79f 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -26,16 +26,11 @@
*
************************************************************************/
-
#ifdef SW_DLLIMPLEMENTATION
#undef SW_DLLIMPLEMENTATION
#endif
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#endif
-
#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 ddc1a2f..e7490b0 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>
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index bb5eea6..4e2630a 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -51,10 +51,7 @@
#include <wrtsh.hxx>
#include <dbui.hrc>
#include <vector>
-
#include <unomid.h>
-
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
using namespace utl;
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index b374ce8..c0b8c6e 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -26,15 +26,12 @@
*
************************************************************************/
-
#ifdef SW_DLLIMPLEMENTATION
#undef SW_DLLIMPLEMENTATION
#endif
-
#include "hintids.hxx"
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
#include <svx/htmlmode.hxx>
#include <svx/svxids.hrc>
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index d2c7d74..0b2a072 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -26,18 +26,13 @@
*
************************************************************************/
-
#ifdef SW_DLLIMPLEMENTATION
#undef SW_DLLIMPLEMENTATION
#endif
-
#include <hintids.hxx>
-#ifndef _SVSTDARR_STRINGSSORTDTOR
-#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx>
-#endif
#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 5b85afc..648af2b 100644
--- a/sw/source/ui/inc/basesh.hxx
+++ b/sw/source/ui/inc/basesh.hxx
@@ -28,10 +28,8 @@
#ifndef _SWBASESH_HXX
#define _SWBASESH_HXX
-
#include <shellid.hxx>
-#define _SVSTDARR_USHORTS
#include <tools/link.hxx>
#include <vcl/timer.hxx>
#include <sfx2/module.hxx>
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 1f03374..354b6a0 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>
-#define _SVSTDARR_STRINGSISORTDTOR
#include <svl/svstdarr.hxx>
class SwWrtShell;
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index a5431c6..0e20036 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -27,10 +27,8 @@
************************************************************************/
#ifndef _FLDMGR_HXX
#define _FLDMGR_HXX
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_STRINGSDTOR
+
#include <svl/svstdarr.hxx>
-#endif
#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 430d0e5..1824e49 100644
--- a/sw/source/ui/inc/label.hxx
+++ b/sw/source/ui/inc/label.hxx
@@ -28,10 +28,7 @@
#ifndef _LABEL_HXX
#define _LABEL_HXX
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#endif
#include <sfx2/tabdlg.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <labelcfg.hxx>
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index d25c542..4f1dcde 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/ui/index/idxmrk.cxx
@@ -26,11 +26,8 @@
*
************************************************************************/
-
-
#include <hintids.hxx>
#include <helpid.h>
-#define _SVSTDARR_STRINGSSORT
#include <svl/svstdarr.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 514dd45..8ae8043 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>
-#define _SVSTDARR_STRINGSSORT
#include <svl/svstdarr.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index b85dfaa..22fc7b2 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "SwRewriter.hxx"
#include "chrdlg.hrc"
#include "cmdid.h"
@@ -52,11 +51,7 @@
#include "wrtsh.hxx"
#include "wview.hxx"
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#endif
-
#include <comphelper/anytostring.hxx>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 345ffe6..c80a663 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -31,7 +31,6 @@
#undef SW_DLLIMPLEMENTATION
#endif
-#define _SVSTDARR_STRINGSDTOR
#include <hintids.hxx>
#include <vcl/menu.hxx>
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 34ebde1..80380a2 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -26,12 +26,6 @@
*
************************************************************************/
-
-
-#define _SVSTDARR_STRINGSSORTDTOR
-#define _SVSTDARR_USHORTS
-
-
#include <redline.hxx>
#include <tools/datetime.hxx>
#include <vcl/msgbox.hxx>
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index 6cf56b1..4cf6701 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -30,12 +30,6 @@
#undef SW_DLLIMPLEMENTATION
#endif
-
-
-#define _SVSTDARR_STRINGSSORTDTOR
-#define _SVSTDARR_USHORTS
-
-
#include <redline.hxx>
#include <vcl/msgbox.hxx>
#include <svl/svstdarr.hxx>
diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx
index 2fc57e5..b69b861 100644
--- a/sw/source/ui/shells/grfshex.cxx
+++ b/sw/source/ui/shells/grfshex.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-
#include <docary.hxx>
#include <grfsh.hxx>
#include <wrtsh.hxx>
@@ -37,7 +35,6 @@
#include <swundo.hxx>
#include <shells.hrc>
#include <caption.hxx>
-#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx>
#include <svtools/filter.hxx>
#include <svx/htmlmode.hxx>
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 4c24080..95be5d0 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <com/sun/star/util/SearchOptions.hpp>
#include <com/sun/star/util/SearchFlags.hpp>
#include <com/sun/star/i18n/TransliterationModules.hpp>
@@ -35,11 +34,8 @@
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-
-#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx>
#include <svl/aeitem.hxx>
-
#include <SwStyleNameMapper.hxx>
#include <docary.hxx>
#include <hintids.hxx>
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 397449c..423fad9 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -26,14 +26,9 @@
*
************************************************************************/
-
-
#include <hintids.hxx>
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#endif
#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 84162bd..6e0b7e9 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -26,19 +26,11 @@
*
************************************************************************/
-
#include <com/sun/star/text/NotePrintMode.hpp>
-
#include <cstdarg>
-
#include <cmdid.h>
-
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#endif
#include <sfx2/request.hxx>
-
#include <sfx2/progress.hxx>
#include <sfx2/app.hxx>
#include <vcl/msgbox.hxx>
diff --git a/sw/source/ui/utlui/bookctrl.cxx b/sw/source/ui/utlui/bookctrl.cxx
index 8e0e62f..4293ded 100644
--- a/sw/source/ui/utlui/bookctrl.cxx
+++ b/sw/source/ui/utlui/bookctrl.cxx
@@ -26,13 +26,9 @@
*
************************************************************************/
-
#include "hintids.hxx"
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
-#endif
#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 82c7bad..f2c9657 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -26,11 +26,7 @@
*
************************************************************************/
-
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#endif
#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 cac16e6..6fe0c60 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -26,11 +26,7 @@
*
************************************************************************/
-
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#endif
#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <sfx2/fcontnr.hxx>
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index b19f92d..cd9b0b4 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -26,11 +26,6 @@
*
************************************************************************/
-
-
-
-#define _SVSTDARR_STRINGSDTOR
-#define _SVSTDARR_STRINGSISORTDTOR
#include <svl/svstdarr.hxx>
#include <tools/urlobj.hxx>
#include <vcl/dialog.hxx>
diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx
index 78cff6f..42bf775 100644
--- a/sw/source/ui/wrtsh/wrtundo.cxx
+++ b/sw/source/ui/wrtsh/wrtundo.cxx
@@ -26,10 +26,6 @@
*
************************************************************************/
-
-
-
-#define _SVSTDARR_STRINGSDTOR
#include <tools/resid.hxx>
#include <sfx2/app.hxx>
#include <svl/slstitm.hxx>
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index fbf4c87..a4af1aa 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -27,10 +27,7 @@
************************************************************************/
#include <tools/debug.hxx>
-#ifndef _SVSTDARR_STRINGSSORTDTOR_DECL
-#define _SVSTDARR_STRINGSSORTDTOR
#include <svl/svstdarr.hxx>
-#endif
#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 b966b35..2deb421 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-#define _SVSTDARR_ULONGS
-
#include <svl/svstdarr.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
@@ -52,7 +49,6 @@
#include <xmloff/families.hxx>
#include <xmloff/xmlnumfi.hxx> // SvXMLNumFmtDefaults
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
#include <svl/nfsymbol.hxx>
#include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 10a08f4..12531da 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/awt/Size.hpp>
@@ -63,10 +62,8 @@
#include <xmloff/xmlnumi.hxx>
-#define _SVSTDARR_USHORTS
#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 2a04159..6bf7c23 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -36,11 +36,8 @@
#include <xmloff/xmltoken.hxx>
#include "xmloff/i18nmap.hxx"
#include <xmloff/xmluconv.hxx>
-
-#include "xmltabi.hxx"
-
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
+#include "xmltabi.hxx"
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
@@ -48,8 +45,6 @@ using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-// ---
-
enum SvXMLTokenMapAttrs
{
XML_TOK_TABSTOP_POSITION,
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index dbc1afb..72bdc98 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"
-#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
using ::rtl::OUString;
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index cd203ef..0242f54 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -34,10 +34,7 @@
#include <tools/solar.h>
#include <tools/debug.hxx>
-#ifndef _SVSTDARR_STRINGSDTOR_DECL
-#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#endif
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
commit 2f9231f320340734568d0df657c9d5ae062331ec
Author: August Sodora <augsod at gmail.com>
Date: Mon Jan 9 01:00:30 2012 -0500
These can be static
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index ce16679..978c9ab 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -85,10 +85,10 @@ using namespace ::xmloff::token;
using namespace ::rtl;
using namespace ::utl;
-const int C_NONE = 0x00;
-const int C_FULL_STOP = 0x01;
-const int C_EXCLAMATION_MARK = 0x02;
-const int C_QUESTION_MARK = 0x04;
+static const int C_NONE = 0x00;
+static const int C_FULL_STOP = 0x01;
+static const int C_EXCLAMATION_MARK = 0x02;
+static const int C_QUESTION_MARK = 0x04;
static const sal_Char pImplWrdStt_ExcptLstStr[] = "WordExceptList";
static const sal_Char pImplCplStt_ExcptLstStr[] = "SentenceExceptList";
@@ -108,36 +108,35 @@ static const sal_Char sImplWordChars[] = "-'";
void EncryptBlockName_Imp( String& rName );
-
// FileVersions Number for the Substitution-/Exception list separately
#define WORDLIST_VERSION_358 1
#define EXEPTLIST_VERSION_358 0
-
_SV_IMPL_SORTAR_ALG( SvxAutocorrWordList, SvxAutocorrWordPtr )
TYPEINIT0(SvxAutoCorrect)
typedef SvxAutoCorrectLanguageLists* SvxAutoCorrectLanguageListsPtr;
-inline int IsWordDelim( const sal_Unicode c )
+static inline int IsWordDelim( const sal_Unicode c )
{
return ' ' == c || '\t' == c || 0x0a == c ||
0xA0 == c || 0x2011 == c || 0x1 == c;
}
-inline int IsLowerLetter( sal_Int32 nCharType )
+static inline int IsLowerLetter( sal_Int32 nCharType )
{
return CharClass::isLetterType( nCharType ) &&
0 == ( ::com::sun::star::i18n::KCharacterType::UPPER & nCharType);
}
-inline int IsUpperLetter( sal_Int32 nCharType )
+
+static inline int IsUpperLetter( sal_Int32 nCharType )
{
return CharClass::isLetterType( nCharType ) &&
0 == ( ::com::sun::star::i18n::KCharacterType::LOWER & nCharType);
}
-sal_Bool lcl_IsSymbolChar( CharClass& rCC, const String& rTxt,
- xub_StrLen nStt, xub_StrLen nEnd )
+static sal_Bool lcl_IsSymbolChar( CharClass& rCC, const String& rTxt,
+ xub_StrLen nStt, xub_StrLen nEnd )
{
for( ; nStt < nEnd; ++nStt )
{
@@ -148,7 +147,6 @@ sal_Bool lcl_IsSymbolChar( CharClass& rCC, const String& rTxt,
return sal_False;
}
-
static sal_Bool lcl_IsInAsciiArr( const sal_Char* pArr, const sal_Unicode c )
{
sal_Bool bRet = sal_False;
@@ -276,7 +274,7 @@ sal_Bool SvxAutocorrWordList::Seek_Entry( const SvxAutocorrWordPtr aE, sal_uInt1
return sal_False;
}
-void lcl_ClearTable(boost::ptr_map<LanguageType, SvxAutoCorrectLanguageLists>& rLangTable)
+static void lcl_ClearTable(boost::ptr_map<LanguageType, SvxAutoCorrectLanguageLists>& rLangTable)
{
rLangTable.clear();
}
@@ -1690,7 +1688,7 @@ void EncryptBlockName_Imp( String& rName )
}
/* This code is copied from SwXMLTextBlocks::GeneratePackageName */
-void GeneratePackageName ( const String& rShort, String& rPackageName )
+static void GeneratePackageName ( const String& rShort, String& rPackageName )
{
rPackageName = rShort;
xub_StrLen nPos = 0;
@@ -1704,7 +1702,7 @@ void GeneratePackageName ( const String& rShort, String& rPackageName )
}
}
-const SvxAutocorrWord* lcl_SearchWordsInList(
+static const SvxAutocorrWord* lcl_SearchWordsInList(
SvxAutoCorrectLanguageListsPtr pList, const String& rTxt,
xub_StrLen& rStt, xub_StrLen nEndPos, SvxAutoCorrDoc& )
{
@@ -1845,7 +1843,7 @@ sal_Bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
return sal_False;
}
-sal_Bool lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
+static sal_Bool lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
{
String sAbk( '~' );
sal_uInt16 nPos;
commit 9ee49871a8ae0456d72ebaebb8955ea68fd17ec2
Author: August Sodora <augsod at gmail.com>
Date: Mon Jan 9 01:03:51 2012 -0500
Remove unused table declaration
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 35d5b20..ce16679 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -118,7 +118,6 @@ _SV_IMPL_SORTAR_ALG( SvxAutocorrWordList, SvxAutocorrWordPtr )
TYPEINIT0(SvxAutoCorrect)
typedef SvxAutoCorrectLanguageLists* SvxAutoCorrectLanguageListsPtr;
-DECLARE_TABLE( SvxAutoCorrLanguageTable_Impl, SvxAutoCorrectLanguageListsPtr)
inline int IsWordDelim( const sal_Unicode c )
{
More information about the Libreoffice-commits
mailing list