diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/app.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/module.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/stbitem.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/tbxctrl.hxx | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index f9d4cd8fc6f7..0d9e8e31b93d 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -198,9 +198,9 @@ public: // Object-Factories/global arrays 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 RegisterStatusBarControl_Impl(SfxModule*, const SfxStbCtrlFactory&); SAL_DLLPRIVATE void RegisterMenuControl_Impl(SfxModule*, const SfxMenuCtrlFactory&); - SAL_DLLPRIVATE void RegisterToolBoxControl_Impl( SfxModule*, SfxTbxCtrlFactory*); + SAL_DLLPRIVATE void RegisterToolBoxControl_Impl( SfxModule*, const SfxTbxCtrlFactory&); SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl& GetTbxCtrlFactories_Impl() const; SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl& GetStbCtrlFactories_Impl() const; SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl& GetMenuCtrlFactories_Impl() const; diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 363bbf92d748..824a9c8624b2 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -77,9 +77,9 @@ public: ResMgr* GetResMgr(); SfxSlotPool* GetSlotPool() const; - void RegisterToolBoxControl(SfxTbxCtrlFactory*); + void RegisterToolBoxControl(const SfxTbxCtrlFactory&); void RegisterChildWindow(SfxChildWinFactory*); - void RegisterStatusBarControl(SfxStbCtrlFactory*); + void RegisterStatusBarControl(const SfxStbCtrlFactory&); void RegisterMenuControl(const SfxMenuCtrlFactory&); virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 97cc515cac93..43eb733a249d 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -115,7 +115,7 @@ public: StatusBar& GetStatusBar() const { return *pBar; } static SfxStatusBarControl* CreateControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar *pBar, SfxModule* ); - static void RegisterStatusBarControl(SfxModule*, SfxStbCtrlFactory*); + static void RegisterStatusBarControl(SfxModule*, const SfxStbCtrlFactory&); }; @@ -129,7 +129,7 @@ public: SfxStatusBarControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ) \ { return new Class( nSlotId, nId, rStb ); } \ void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ - { SfxStatusBarControl::RegisterStatusBarControl( pMod, new SfxStbCtrlFactory( \ + { SfxStatusBarControl::RegisterStatusBarControl( pMod, SfxStbCtrlFactory( \ Class::CreateImpl, typeid(nItemClass), nSlotId ) ); } diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index b0fdb60140d3..f8969fbdb24b 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -224,21 +224,21 @@ public: static SfxItemState GetItemState( const SfxPoolItem* pState ); static SfxToolBoxControl* CreateControl( sal_uInt16 nSlotId, sal_uInt16 nTbxId, ToolBox *pBox, SfxModule *pMod ); - static void RegisterToolBoxControl( SfxModule*, SfxTbxCtrlFactory*); + static void RegisterToolBoxControl( SfxModule*, const SfxTbxCtrlFactory&); }; #define SFX_IMPL_TOOLBOX_CONTROL(Class, nItemClass) \ SfxToolBoxControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \ { return new Class( nSlotId, nId, rTbx ); } \ void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ - { SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \ + { SfxToolBoxControl::RegisterToolBoxControl( pMod, SfxTbxCtrlFactory( \ Class::CreateImpl, typeid(nItemClass), nSlotId ) ); } #define SFX_IMPL_TOOLBOX_CONTROL_ARG(Class, nItemClass, Arg) \ SfxToolBoxControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \ { return new Class( nSlotId, nId, rTbx, Arg); } \ void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ - { SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \ + { SfxToolBoxControl::RegisterToolBoxControl( pMod, SfxTbxCtrlFactory( \ Class::CreateImpl, typeid(nItemClass), nSlotId ) ); } |