Remove _SVSTDARR_STRINGSISORTDTOR

28 files changed, 1 insertions, 103 deletions

diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 63cb333fb155..a0cc9544f804 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 db0f26d9dbf4..3a31f34d9e56 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 d1ac82437ff1..9d46799d58a4 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 938ee6acf917..50b61967d2e3 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 231d7bf337b5..e41c79f0f7f6 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 ddc1a2f838f8..e7490b00d3d0 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 bb5eea648bb4..4e2630ab3667 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 b374ce86c7ad..c0b8c6e39623 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 d2c7d744574d..0b2a0720e9c4 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 5b85afcd7649..648af2bab340 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 1f03374e5f8f..354b6a0e4ab0 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 a5431c6c845f..0e200362ed27 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 430d0e500fa7..1824e49494de 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 d25c542e2629..4f1dcde4253e 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 514dd45f1355..8ae80434eb16 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 b85dfaae4fa6..22fc7b264cf3 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 345ffe664b0c..c80a663b8517 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 34ebde14663f..80380a206aa4 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 6cf56b192ddf..4cf670169111 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 2fc57e5e0ffb..b69b861fb2e9 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 4c24080980aa..95be5d081d52 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 397449c40510..423fad97ed11 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 84162bdb9ab0..6e0b7e9d9c26 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 8e0e62f1fd4b..4293dedd1f18 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 82c7bad2fa56..f2c9657ea8af 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 cac16e6fc292..6fe0c60eef10 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 b19f92deaa08..cd9b0b4f7d3c 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 78cff6f067a0..42bf7750d8a7 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>