mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svl: SfxItemSet: get rid of the "no master pool" warning spam

Browse Source 
No idea why that would be a problem.

Change-Id: Ib655b71ed8cd8a4fe8200209c929434832f3614e
This commit is contained in:
Michael Stahl
2014-11-28 19:16:17 +01:00
parent 426ef2847c
commit 47588a4c98
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
svl/source/items/itemset.cxx
View File

@@ -89,7 +89,6 @@ SfxItemSet::SfxItemSet
_pParent( 0 ), _pParent( 0 ),
_nCount( 0 ) _nCount( 0 )
{ {
SAL_WARN_IF(_pPool != _pPool->GetMasterPool(), "svl.items", "no Master Pool");
// DBG_ASSERT( bTotalRanges || abs( &bTotalRanges - this ) < 1000, // DBG_ASSERT( bTotalRanges || abs( &bTotalRanges - this ) < 1000,
// "please use suitable ranges" ); // "please use suitable ranges" );
#if defined DBG_UTIL && defined SFX_ITEMSET_NO_DEFAULT_CTOR #if defined DBG_UTIL && defined SFX_ITEMSET_NO_DEFAULT_CTOR
@@ -117,7 +116,6 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhic
_nCount( 0 ) _nCount( 0 )
{ {
assert(nWhich1 <= nWhich2); assert(nWhich1 <= nWhich2);
SAL_WARN_IF(_pPool != _pPool->GetMasterPool(), "svl.items", "no Master Pool");
InitRanges_Impl(nWhich1, nWhich2); InitRanges_Impl(nWhich1, nWhich2);
} }
@@ -154,7 +152,6 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool,
_nCount( 0 ) _nCount( 0 )
{ {
assert(nWh1 <= nWh2); assert(nWh1 <= nWh2);
SAL_WARN_IF(_pPool != _pPool->GetMasterPool(), "svl.items", "no Master Pool");
if(!nNull) if(!nNull)
InitRanges_Impl( InitRanges_Impl(
@@ -201,8 +198,6 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool, const sal_uInt16* pWhichPairTable )
, _pWhichRanges(0) , _pWhichRanges(0)
, _nCount(0) , _nCount(0)
{ {
SAL_WARN_IF(_pPool != _pPool->GetMasterPool(), "svl.items", "no Master Pool");
// pWhichPairTable == 0 ist f"ur das SfxAllEnumItemSet // pWhichPairTable == 0 ist f"ur das SfxAllEnumItemSet
if ( pWhichPairTable ) if ( pWhichPairTable )
InitRanges_Impl(pWhichPairTable); InitRanges_Impl(pWhichPairTable);
@@ -213,8 +208,6 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet ):
_pParent( rASet._pParent ), _pParent( rASet._pParent ),
_nCount( rASet._nCount ) _nCount( rASet._nCount )
{ {
SAL_WARN_IF(_pPool != _pPool->GetMasterPool(), "svl.items", "no Master Pool");
// Calculate the attribute count // Calculate the attribute count
sal_uInt16 nCnt = 0; sal_uInt16 nCnt = 0;
sal_uInt16* pPtr = rASet._pWhichRanges; sal_uInt16* pPtr = rASet._pWhichRanges;
@@ -1402,7 +1395,6 @@ SvStream &SfxItemSet::Store
) const ) const
{ {
assert(_pPool); assert(_pPool);
SAL_WARN_IF(_pPool != _pPool->GetMasterPool(), "svl.items", "no Master Pool");
// Remember position of the count (to be able to correct it, if need be) // Remember position of the count (to be able to correct it, if need be)
sal_uLong nCountPos = rStream.Tell(); sal_uLong nCountPos = rStream.Tell();
@@ -1467,7 +1459,6 @@ SvStream &SfxItemSet::Load
) )
{ {
assert(_pPool); assert(_pPool);
SAL_WARN_IF(_pPool != _pPool->GetMasterPool(), "svl.items", "no Master Pool");
// No RefPool => Resolve Surrogates with ItemSet's Pool // No RefPool => Resolve Surrogates with ItemSet's Pool
if ( !pRefPool ) if ( !pRefPool )