[Libreoffice-commits] core.git: include/svl svl/source

[Michael Stahl]

 include/svl/itempool.hxx      |    2 --
 svl/source/items/itempool.cxx |    4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 6796db4cc6c1b8d32a655de5343b9883b07d0aa8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 24 14:09:54 2014 +0100

    svl: just make SfxItemPool::GetMasterPool() always available
    
    Change-Id: Id2e35c19bf2efb73e6a0939cccf37c92ca30c0aa

diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index a52a0b2..0f1c4f3 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 5a56912..8550543 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