diff options
| author | Noel Grandin <noel@peralex.com> | 2012-04-16 00:16:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-19 13:22:38 +0200 |
| commit | f765f52c39e79b633bbc8f1a16567572b7bf7a1a (patch) | |
| tree | c6ea458e326517e923d6a6ae8af3d161ef164440 /svx | |
| parent | eb13c2c5b127910367ed2dac4fd2166a6d9c8a70 (diff) | |
Convert SV_DECL_PTRARR_DEL to boost::ptr_vector
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 4 | ||||
| -rw-r--r-- | 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 dc33eb00723f..f76654ad60a3 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 26eb304d5325..9664b4e7ee56 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: |