Kaydet (Commit) 38ff61b4 authored tarafından Caolán McNamara's avatar Caolán McNamara

no use is made of _pResMgr

so the relevant ctor argument is useless

Change-Id: I32f733cc12820f311656b7e140a36c50e504c739
üst 12bdc609
...@@ -37,7 +37,6 @@ class SFX2_DLLPUBLIC SfxSlotPool ...@@ -37,7 +37,6 @@ class SFX2_DLLPUBLIC SfxSlotPool
{ {
SfxSlotGroupArr_Impl* _pGroups; SfxSlotGroupArr_Impl* _pGroups;
SfxSlotPool* _pParentPool; SfxSlotPool* _pParentPool;
ResMgr* _pResMgr;
SfxInterfaceArr_Impl* _pInterfaces; SfxInterfaceArr_Impl* _pInterfaces;
sal_uInt16 _nCurGroup; sal_uInt16 _nCurGroup;
sal_uInt16 _nCurInterface; sal_uInt16 _nCurInterface;
...@@ -47,8 +46,8 @@ private: ...@@ -47,8 +46,8 @@ private:
const SfxSlot* SeekSlot( sal_uInt16 nObject ); const SfxSlot* SeekSlot( sal_uInt16 nObject );
public: public:
SfxSlotPool( SfxSlotPool* pParent=0, ResMgr* pMgr=0); SfxSlotPool(SfxSlotPool* pParent=0);
~SfxSlotPool(); ~SfxSlotPool();
void RegisterInterface( SfxInterface& rFace ); void RegisterInterface( SfxInterface& rFace );
void ReleaseInterface( SfxInterface& rFace ); void ReleaseInterface( SfxInterface& rFace );
......
...@@ -167,7 +167,7 @@ void SfxModule::Construct_Impl() ...@@ -167,7 +167,7 @@ void SfxModule::Construct_Impl()
SfxModule* pPtr = (SfxModule*)this; SfxModule* pPtr = (SfxModule*)this;
rArr.push_back( pPtr ); rArr.push_back( pPtr );
pImpl = new SfxModule_Impl; pImpl = new SfxModule_Impl;
pImpl->pSlotPool = new SfxSlotPool( &pApp->GetAppSlotPool_Impl(), pResMgr ); pImpl->pSlotPool = new SfxSlotPool(&pApp->GetAppSlotPool_Impl());
pImpl->pTbxCtrlFac=0; pImpl->pTbxCtrlFac=0;
pImpl->pStbCtrlFac=0; pImpl->pStbCtrlFac=0;
......
...@@ -33,21 +33,16 @@ ...@@ -33,21 +33,16 @@
#include <sfx2/sfx.hrc> #include <sfx2/sfx.hrc>
SfxSlotPool::SfxSlotPool( SfxSlotPool *pParent, ResMgr* pResManager ) SfxSlotPool::SfxSlotPool(SfxSlotPool *pParent)
: _pGroups(0) : _pGroups(0)
, _pParentPool( pParent ) , _pParentPool( pParent )
, _pResMgr( pResManager )
, _pInterfaces(0) , _pInterfaces(0)
, _nCurGroup(0) , _nCurGroup(0)
, _nCurInterface(0) , _nCurInterface(0)
, _nCurMsg(0) , _nCurMsg(0)
{ {
if ( !_pResMgr )
_pResMgr = SfxApplication::GetOrCreate()->GetOffResManager_Impl();
} }
SfxSlotPool::~SfxSlotPool() SfxSlotPool::~SfxSlotPool()
{ {
_pParentPool = 0; _pParentPool = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment