diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 14:00:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 16:35:59 +0000 |
| commit | 38ff61b44e466ac138632c71ed538749fdada2b0 (patch) | |
| tree | a29e3012b5661e66585789a8f52b417d494cd801 | |
| parent | 12bdc6093fbfd28b885f2783a6fc7a63547f0344 (diff) | |
no use is made of _pResMgr
so the relevant ctor argument is useless
Change-Id: I32f733cc12820f311656b7e140a36c50e504c739
| -rw-r--r-- | include/sfx2/msgpool.hxx | 5 | ||||
| -rw-r--r-- | sfx2/source/appl/module.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/msgpool.cxx | 7 |
3 files changed, 4 insertions, 10 deletions
diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx index f21277e017dd..2e3abdbd83b9 100644 --- a/include/sfx2/msgpool.hxx +++ b/include/sfx2/msgpool.hxx @@ -37,7 +37,6 @@ class SFX2_DLLPUBLIC SfxSlotPool { SfxSlotGroupArr_Impl* _pGroups; SfxSlotPool* _pParentPool; - ResMgr* _pResMgr; SfxInterfaceArr_Impl* _pInterfaces; sal_uInt16 _nCurGroup; sal_uInt16 _nCurInterface; @@ -47,8 +46,8 @@ private: const SfxSlot* SeekSlot( sal_uInt16 nObject ); public: - SfxSlotPool( SfxSlotPool* pParent=0, ResMgr* pMgr=0); - ~SfxSlotPool(); + SfxSlotPool(SfxSlotPool* pParent=0); + ~SfxSlotPool(); void RegisterInterface( SfxInterface& rFace ); void ReleaseInterface( SfxInterface& rFace ); diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 00dde7424928..424880e0d042 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -167,7 +167,7 @@ void SfxModule::Construct_Impl() SfxModule* pPtr = (SfxModule*)this; rArr.push_back( pPtr ); pImpl = new SfxModule_Impl; - pImpl->pSlotPool = new SfxSlotPool( &pApp->GetAppSlotPool_Impl(), pResMgr ); + pImpl->pSlotPool = new SfxSlotPool(&pApp->GetAppSlotPool_Impl()); pImpl->pTbxCtrlFac=0; pImpl->pStbCtrlFac=0; diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index f059dada9385..ac0026d4ef34 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -33,21 +33,16 @@ #include <sfx2/sfx.hrc> -SfxSlotPool::SfxSlotPool( SfxSlotPool *pParent, ResMgr* pResManager ) +SfxSlotPool::SfxSlotPool(SfxSlotPool *pParent) : _pGroups(0) , _pParentPool( pParent ) - , _pResMgr( pResManager ) , _pInterfaces(0) , _nCurGroup(0) , _nCurInterface(0) , _nCurMsg(0) { - if ( !_pResMgr ) - _pResMgr = SfxApplication::GetOrCreate()->GetOffResManager_Impl(); } - - SfxSlotPool::~SfxSlotPool() { _pParentPool = 0; |