summaryrefslogtreecommitdiff
path: root/sfx2/inc/arrdecl.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-06-14 10:42:58 +0200
committerMichael Stahl <mstahl@redhat.com>2012-06-20 19:46:38 +0200
commita1cedf2b1ed350687e5369707b715b41ca7808e3 (patch)
treefba3d9f1442d6493067eb80e834ce0958f61e11a /sfx2/inc/arrdecl.hxx
parent0b784bd6419643288066cb233c78b609d83048cc (diff)
Convert SV_DECL_PTRARR_DEL(SfxMenuCtrlFactArr_Impl) to std::vector
Change-Id: I65b6f6e1f615c8f6e778b10945c60a28875d88ba
Diffstat (limited to 'sfx2/inc/arrdecl.hxx')
-rw-r--r--sfx2/inc/arrdecl.hxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index 45481f839d77..94892a75b61c 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
@@ -31,6 +31,7 @@
#include <svl/svarray.hxx>
#include <sfx2/minarray.hxx>
#include <vector>
+#include <boost/ptr_container/ptr_vector.hpp>
class SfxObjectShell;
SV_DECL_PTRARR( SfxObjectShellArr_Impl, SfxObjectShell*, 4 )
@@ -48,7 +49,12 @@ struct SfxStbCtrlFactory;
SV_DECL_PTRARR_DEL( SfxStbCtrlFactArr_Impl, SfxStbCtrlFactory*, 8 )
struct SfxMenuCtrlFactory;
-SV_DECL_PTRARR_DEL( SfxMenuCtrlFactArr_Impl, SfxMenuCtrlFactory*, 2 )
+class SfxMenuCtrlFactArr_Impl : public std::vector<SfxMenuCtrlFactory*>
+{
+public:
+ // de-allocates child objects
+ ~SfxMenuCtrlFactArr_Impl();
+};
struct SfxChildWinFactory;
class SfxChildWinFactArr_Impl : public std::vector<SfxChildWinFactory*>