diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-24 14:09:54 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-24 14:10:48 +0100 |
| commit | 6796db4cc6c1b8d32a655de5343b9883b07d0aa8 (patch) | |
| tree | cc72d5e398b5b7288980ef572d71dc4f717f2dbc | |
| parent | 94d2de0ba1f010be7acf0d00ce5b2ed4ed2b895b (diff) | |
svl: just make SfxItemPool::GetMasterPool() always available
Change-Id: Id2e35c19bf2efb73e6a0939cccf37c92ca30c0aa
| -rw-r--r-- | include/svl/itempool.hxx | 2 | ||||
| -rw-r--r-- | svl/source/items/itempool.cxx | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index a52a0b26c4db..0f1c4f32511b 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -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(); diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 5a56912f8c20..855054333706 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -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 |