diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-11 12:51:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-12 08:01:34 +0200 |
| commit | b6639b0e12e2bf914371124b870e55761b1155a2 (patch) | |
| tree | ef1feae7910472bbb8deb5b135c20de421d4943c /include | |
| parent | 51f9d14ae75bb01ebb79a5ed85eecabc794da490 (diff) | |
sfx2: boost::ptr_vector->std::vector
Change-Id: Icb9c44a6c251817a66276af32f0c2d1b26fb923a
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/app.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/mnuitem.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/module.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 8db9229f3fe1..f9d4cd8fc6f7 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -199,7 +199,7 @@ public: SAL_DLLPRIVATE void RegisterChildWindow_Impl(SfxModule*, SfxChildWinFactory*); SAL_DLLPRIVATE void RegisterChildWindowContext_Impl(SfxModule*, sal_uInt16, SfxChildWinContextFactory*); SAL_DLLPRIVATE void RegisterStatusBarControl_Impl(SfxModule*, SfxStbCtrlFactory*); - SAL_DLLPRIVATE void RegisterMenuControl_Impl(SfxModule*, SfxMenuCtrlFactory*); + SAL_DLLPRIVATE void RegisterMenuControl_Impl(SfxModule*, const SfxMenuCtrlFactory&); SAL_DLLPRIVATE void RegisterToolBoxControl_Impl( SfxModule*, SfxTbxCtrlFactory*); SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl& GetTbxCtrlFactories_Impl() const; SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl& GetStbCtrlFactories_Impl() const; diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx index 7afaec06c3a8..56dc4bd63852 100644 --- a/include/sfx2/mnuitem.hxx +++ b/include/sfx2/mnuitem.hxx @@ -68,7 +68,7 @@ public: static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & ); static SfxUnoMenuControl* CreateControl( const OUString&, sal_uInt16, Menu&, const OUString& sItemText, SfxBindings&, SfxVirtualMenu* ); - static void RegisterMenuControl( SfxModule*, SfxMenuCtrlFactory* ); + static void RegisterMenuControl( SfxModule*, const SfxMenuCtrlFactory& ); }; @@ -116,7 +116,7 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const SfxMenuControl* Class::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ) \ { return new Class(nId, rMenu, rBindings); } \ void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ - { SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \ + { SfxMenuControl::RegisterMenuControl( pMod, SfxMenuCtrlFactory( \ Class::CreateImpl, typeid(nItemClass), nSlotId ) ); } #endif diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 6d257b19a276..363bbf92d748 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -80,7 +80,7 @@ public: void RegisterToolBoxControl(SfxTbxCtrlFactory*); void RegisterChildWindow(SfxChildWinFactory*); void RegisterStatusBarControl(SfxStbCtrlFactory*); - void RegisterMenuControl(SfxMenuCtrlFactory*); + void RegisterMenuControl(const SfxMenuCtrlFactory&); virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, |