diff options
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/ascii/ascatr.cxx | 3 | ||||
-rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 7 | ||||
-rw-r--r-- | sw/source/filter/html/htmlbas.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlplug.cxx | 1 | ||||
-rw-r--r-- | sw/source/filter/html/svxcss1.hxx | 5 | ||||
-rw-r--r-- | sw/source/filter/html/swhtml.hxx | 9 | ||||
-rw-r--r-- | sw/source/filter/html/wrthtml.hxx | 2 | ||||
-rw-r--r-- | sw/source/filter/writer/writer.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlexpit.cxx | 8 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlfmt.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltbli.hxx | 5 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexte.cxx | 3 |
13 files changed, 0 insertions, 55 deletions
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx index e5995f265a1a..9682ada54edf 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 705821e087e8..97087f566f29 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 fe2998275884..b3a664f04fd7 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 d5c2d5fc161b..cb3692bd6b28 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 1512fd73c371..d8049aedb265 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 45b8b7d0c3d0..2343257177b5 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 5f9753e9bb86..71082c78bf0d 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 1d028016605d..4f5cac8528d8 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 55294496fb9c..3d3cc838e40f 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 ebe9799850d0..f1afbd08db09 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 9b6d281e30d2..8320b91a5012 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 4d6d2cfc88e7..ea94139f1035 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 0835c087f4a7..2dc565c04f97 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; |