summaryrefslogtreecommitdiff
path: root/sfx2/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-06-14 09:25:19 +0200
committerMichael Stahl <mstahl@redhat.com>2012-06-20 19:46:38 +0200
commit0b784bd6419643288066cb233c78b609d83048cc (patch)
tree05649c7dcae55d782aaee4d93ed0dfdf8917d00e /sfx2/inc
parent7f91d56e078048e2e0bc8f3edf1e47ff0b7f0d5a (diff)
Convert SV_DECL_PTRARR(SfxModuleArr_Impl) to std::vector
Change-Id: I905d17fbbda11199065237b396c52bacc481e414
Diffstat (limited to 'sfx2/inc')
-rw-r--r--sfx2/inc/arrdecl.hxx2
-rw-r--r--sfx2/inc/sfx2/app.hxx3
-rw-r--r--sfx2/inc/sfx2/module.hxx4
3 files changed, 6 insertions, 3 deletions
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index f8e4eb478226..45481f839d77 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
@@ -59,7 +59,7 @@ public:
};
class SfxModule;
-SV_DECL_PTRARR( SfxModuleArr_Impl, SfxModule*, 2 )
+typedef ::std::vector<SfxModule*> SfxModuleArr_Impl;
class SfxFrame;
typedef ::std::vector<SfxFrame*> SfxFrameArr_Impl;
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 8cef64876815..8b26b4472b79 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -89,7 +89,8 @@ class StarBASIC;
class SfxWorkWindow;
class SfxFilterMatcher;
class SfxModule;
-class SfxModuleArr_Impl;
+class SfxModule;
+typedef ::std::vector<SfxModule*> SfxModuleArr_Impl;
class Window;
class INetURLObject;
struct SfxConstant;
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index 98fff6619b36..dc4a5b093bca 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -36,6 +36,7 @@
#include <sal/types.h>
#include <tools/fldunit.hxx>
#include <com/sun/star/uno/Reference.hxx>
+#include <vector>
class ImageList;
@@ -43,7 +44,8 @@ class SfxBindings;
class SfxObjectFactory;
class ModalDialog;
class SfxObjectFactory;
-class SfxModuleArr_Impl;
+class SfxModule;
+typedef ::std::vector<SfxModule*> SfxModuleArr_Impl;
class SfxModule_Impl;
class SfxSlotPool;
struct SfxChildWinContextFactory;