mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svx: boost::ptr_vector->std::vector<std::unique_ptr>

Browse Source 
Change-Id: Ib4ebadcdecc0f673c585c820b4aa4a3e1e123f0c
This commit is contained in:
Noel Grandin
2015-11-11 11:22:58 +02:00
parent 44d3577f4b
commit 8978ce53e1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
svx/source/form/fmshimp.cxx
View File

@@ -95,6 +95,7 @@
#include <vcl/layout.hxx> #include <vcl/layout.hxx>
#include <vcl/waitobj.hxx> #include <vcl/waitobj.hxx>
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <o3tl/make_unique.hxx>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
@@ -4036,8 +4037,7 @@ ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nI
for (sal_Int16 i=0; i<m_pConversionMenu->GetItemCount(); ++i) for (sal_Int16 i=0; i<m_pConversionMenu->GetItemCount(); ++i)
{ {
_rBindings.Invalidate(m_pConversionMenu->GetItemId(i)); _rBindings.Invalidate(m_pConversionMenu->GetItemId(i));
SfxStatusForwarder* pForwarder = new SfxStatusForwarder(m_pConversionMenu->GetItemId(i), *this); m_aStatusForwarders.push_back(o3tl::make_unique<SfxStatusForwarder>(m_pConversionMenu->GetItemId(i), *this));
m_aStatusForwarders.push_back(pForwarder);
} }
} }
} }

4
svx/source/inc/fmshimp.hxx
View File

@@ -61,7 +61,7 @@
#include <queue> #include <queue>
#include <set> #include <set>
#include <vector> #include <vector>
#include <boost/ptr_container/ptr_vector.hpp> #include <memory>
typedef std::vector< css::uno::Reference< css::form::XForm > > FmFormArray; typedef std::vector< css::uno::Reference< css::form::XForm > > FmFormArray;
@@ -571,7 +571,7 @@ public:
class SVX_DLLPUBLIC ControlConversionMenuController : public SfxMenuControl class SVX_DLLPUBLIC ControlConversionMenuController : public SfxMenuControl
{ {
protected: protected:
boost::ptr_vector<SfxStatusForwarder> m_aStatusForwarders; std::vector<std::unique_ptr<SfxStatusForwarder> > m_aStatusForwarders;
Menu* m_pMainMenu; Menu* m_pMainMenu;
PopupMenu* m_pConversionMenu; PopupMenu* m_pConversionMenu;