Remove _SVSTDARR_STRINGSISORTDTOR

2012-01-09 20:37:49 -05:00 · 2012-01-09 20:37:49 -05:00 · bcb9ddaa7e
commit bcb9ddaa7e
parent 2f9231f320
120 changed files with 5 additions and 456 deletions
--- 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;
--- 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>
--- 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>
--- 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;
--- 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
--- 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;
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>

--- 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(
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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,
--- 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>
--- 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;
--- 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>
--- 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"
--- 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>

--- 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>
--- 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"
--- 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>
--- 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;
--- 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 = ':';
--- 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>

--- 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>
--- 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>
--- 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
 {

--- 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
--- 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>
--- 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>
--- 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>
--- 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;
--- 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>
--- 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>
--- 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>

 //........................................................................
--- 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"
--- 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>
--- 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>

--- 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;
--- 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>
--- 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"
--- 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
 {
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"

--- 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;

--- 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"
--- 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>

--- 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>
--- 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;
--- 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()
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"

--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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;
--- 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;
--- 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>
--- 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>
--- 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"
--- 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"
--- 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>
--- 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>
--- 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;
--- 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>
--- 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>
--- 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>
--- 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;
--- 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"
--- 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>
--- 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>
--- a/Show More
+++ b/Show More