diff options
| author | August Sodora <augsod@gmail.com> | 2012-01-09 20:37:49 -0500 |
|---|---|---|
| committer | August Sodora <augsod@gmail.com> | 2012-01-10 23:18:14 -0500 |
| commit | bcb9ddaa7ea954cebaa031dc74cf7cd21489d8d6 (patch) | |
| tree | 863025bd0ed489fdb1cadfaf5b424f112697126d /xmloff | |
| parent | 2f9231f320340734568d0df657c9d5ae062331ec (diff) | |
Remove _SVSTDARR_STRINGSISORTDTOR
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/style/styleexp.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/style/xmlnumi.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/style/xmltabi.cxx | 7 | ||||
| -rw-r--r-- | xmloff/source/text/XMLTextColumnsContext.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 3 |
6 files changed, 1 insertions, 20 deletions
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index fbf4c872d763..a4af1aa9df5e 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 b966b355328a..2deb42136292 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 10a08f40cf57..12531da3f1d2 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 2a04159c06d6..6bf7c23654fb 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 dbc1afb8054d..72bdc98cef26 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 cd203ef5fced..0242f545a24d 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> |