From 4a12c03a094f042353f0d7f3cd98074fed70e215 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 16 Apr 2012 00:16:05 +0200
Subject: [PATCH 4/4] Convert SV_DECL_PTRARR_DEL to boost::ptr_vector

---
 svx/source/form/fmshimp.cxx |    4 +---
 svx/source/inc/fmshimp.hxx  |    3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index dc33eb0..f76654a 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -4105,8 +4105,6 @@ sal_Bool SearchableControlIterator::ShouldStepInto(const Reference< XInterface>&
 //==============================================================================
 //==============================================================================
 
-SV_IMPL_PTRARR(StatusForwarderArray, SfxStatusForwarder*)
-
 SFX_IMPL_MENU_CONTROL(ControlConversionMenuController, SfxBoolItem);
 
 //------------------------------------------------------------------------------
@@ -4124,7 +4122,7 @@ ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nI
         {
             _rBindings.Invalidate(m_pConversionMenu->GetItemId(i));
             SfxStatusForwarder* pForwarder = new SfxStatusForwarder(m_pConversionMenu->GetItemId(i), *this);
-            m_aStatusForwarders.C40_INSERT(SfxStatusForwarder, pForwarder, m_aStatusForwarders.Count());
+            m_aStatusForwarders.push_back(pForwarder);
         }
     }
 }
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 26eb304..9664b4e 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -74,6 +74,7 @@
 #include <queue>
 #include <set>
 #include <vector>
+#include <boost/ptr_container/ptr_vector.hpp>
 
 typedef std::vector<SdrObject*> SdrObjArray;
 //  SV_DECL_OBJARR(FmFormArray, ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>, 32, 16);
@@ -584,7 +585,7 @@ public:
 };
 
 // ========================================================================
-SV_DECL_PTRARR_DEL(StatusForwarderArray, SfxStatusForwarder*, 16)
+typedef boost::ptr_vector<SfxStatusForwarder> StatusForwarderArray;
 class SVX_DLLPUBLIC ControlConversionMenuController : public SfxMenuControl
 {
 protected:
-- 
1.7.5.4