Kaydet (Commit) 6796db4c authored tarafından Michael Stahl's avatar Michael Stahl

svl: just make SfxItemPool::GetMasterPool() always available

Change-Id: Id2e35c19bf2efb73e6a0939cccf37c92ca30c0aa
üst 94d2de0b
......@@ -185,9 +185,7 @@ public:
void SetStoringRange( sal_uInt16 nFrom, sal_uInt16 nTo );
void SetSecondaryPool( SfxItemPool *pPool );
SfxItemPool* GetSecondaryPool() const;
#ifdef DBG_UTIL
SfxItemPool* GetMasterPool() const;
#endif
void FreezeIdRanges();
void Delete();
......
......@@ -441,7 +441,7 @@ void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool )
// Set Master of new Secondary Pools
DBG_ASSERT( !pPool || pPool->pImp->mpMaster == pPool, "Secondary is present in two Pools" );
SfxItemPool *pNewMaster = pImp->mpMaster ? pImp->mpMaster : this;
SfxItemPool *pNewMaster = GetMasterPool() ? pImp->mpMaster : this;
for ( SfxItemPool *p = pPool; p; p = p->pImp->mpSecondary )
p->pImp->mpMaster = pNewMaster;
......@@ -894,12 +894,10 @@ SfxItemPool* SfxItemPool::GetSecondaryPool() const
return pImp->mpSecondary;
}
#ifdef DBG_UTIL
SfxItemPool* SfxItemPool::GetMasterPool() const
{
return pImp->mpMaster;
}
#endif
/**
* This method should be called at the master pool, when all secondary
......
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