summaryrefslogtreecommitdiffstats
path: root/sfx2
diff options
context:
space:
mode:
authorAugust Sodora <augsod@gmail.com>2012-01-09 20:37:49 -0500
committerAugust Sodora <augsod@gmail.com>2012-01-10 23:18:14 -0500
commitbcb9ddaa7ea954cebaa031dc74cf7cd21489d8d6 (patch)
tree863025bd0ed489fdb1cadfaf5b424f112697126d /sfx2
parentThese can be static (diff)
downloadcore-bcb9ddaa7ea954cebaa031dc74cf7cd21489d8d6.tar.gz
core-bcb9ddaa7ea954cebaa031dc74cf7cd21489d8d6.zip
Remove _SVSTDARR_STRINGSISORTDTOR
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sfx2/appuno.hxx18
-rw-r--r--sfx2/source/appl/app.cxx3
-rw-r--r--sfx2/source/appl/appopen.cxx2
-rw-r--r--sfx2/source/appl/linkmgr2.cxx3
-rw-r--r--sfx2/source/appl/sfxhelp.cxx3
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx3
-rw-r--r--sfx2/source/dialog/templdlg.cxx3
-rw-r--r--sfx2/source/dialog/versdlg.cxx2
-rw-r--r--sfx2/source/doc/docfile.cxx2
-rw-r--r--sfx2/source/doc/docinsert.cxx3
-rw-r--r--sfx2/source/doc/docvor.cxx1
-rw-r--r--sfx2/source/menu/mnumgr.cxx2
12 files changed, 0 insertions, 45 deletions
diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx
index 9c5727e62f1a..00e8129b2994 100644
--- 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,
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index d3f134d98da0..4931518e54dc 100644
--- 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>
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index e60c1084921f..7bb7a5c42bbd 100644
--- 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;
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 1f4842035ec1..b7c5f2a22c9a 100644
--- 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>
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 32a542df815a..0dd391c55fa4 100644
--- 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"
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 6770bb78129c..1da12fb4f827 100644
--- 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>
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 675b1530799b..4e60a8689bbe 100644
--- 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>
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 8c5d14ddf686..f6ae242d7373 100644
--- 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"
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 21838839b9fb..af6915890f89 100644
--- 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>
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index ec22501cdd2d..c103116098a1 100644
--- 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;
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index ef882381bdf1..c0f939023f18 100644
--- 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 = ':';
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 567812342b76..e9d7cf86dc52 100644
--- 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>