Remove _SVSTDARR_STRINGSISORTDTOR

8 files changed, 1 insertions, 35 deletions

diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx
index 0e23fb077de1..2affd50a5414 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 b15e3c6f41ee..ad2cea4de619 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 8ba88152addd..2dc1930b0f90 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 9e70e6212fed..ec44cf17f4ae 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 7b620379bbb9..6d48d04ca3c8 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 a3598f7e8b58..152997a60893 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 7f37e435e13d..2dd89e293bf2 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 a6b14024a71d..9736e9785ad4 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>