diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 6590e3730854..51e9f1d91bbb 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -981,9 +981,6 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) } // remove double Id's -#ifndef TF_POOLABLE -#error "TF_POOLABLE should always be set." -#endif { nCount = aUS.Count(); for ( size_t i = 0; i < nCount; ++i ) diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 0cce285c2146..c249a3a8b58b 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -81,14 +81,10 @@ DBG_NAME(SfxAppMainCHAOSReg) //=================================================================== -#ifdef TF_POOLABLE static SfxItemInfo const aItemInfos[] = { { 0, 0 } }; -#else -#error "TF_POOLABLE should always be set." -#endif //=================================================================== diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 257159427833..7072c09c1778 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1000,11 +1000,7 @@ void MappedPut_Impl( SfxAllItemSet &rSet, const SfxPoolItem &rItem ) // Put with mapped Which-Id if possible const SfxItemPool *pPool = rSet.GetPool(); sal_uInt16 nWhich = rItem.Which(); -#ifdef TF_POOLABLE if ( pPool->IsSlot(nWhich) ) -#else -#error "TF_POOLABLE should always be set." -#endif nWhich = pPool->GetWhich(nWhich); rSet.Put( rItem, nWhich ); } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 8f2a39f415ac..4afeb5ed11ad 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -1641,9 +1641,6 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) } //! Remove duplicated Ids? -#ifndef TF_POOLABLE -#error "TF_POOLABLE should always be set." -#endif { nCount = aUS.Count(); diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index 1711cef9871e..d6bf85ff5ba6 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -105,11 +105,7 @@ class SVL_DLLPUBLIC SfxItemPool { friend struct SfxItemPool_Impl; -#ifdef TF_POOLABLE const SfxItemInfo* pItemInfos; -#else -#error "TF_POOLABLE should always be set." -#endif SfxItemPool_Impl* pImp; public: @@ -147,15 +143,8 @@ public: sal_Bool bCloneStaticDefaults = sal_False ); SfxItemPool( const UniString &rName, sal_uInt16 nStart, sal_uInt16 nEnd, -#ifdef TF_POOLABLE const SfxItemInfo *pItemInfos, -#else -#error "TF_POOLABLE should always be set." -#endif SfxPoolItem **pDefaults = 0, -#ifndef TF_POOLABLE -#error "TF_POOLABLE should always be set." -#endif bool bLoadRefCounts = true ); protected: virtual ~SfxItemPool(); @@ -221,15 +210,11 @@ public: void Delete(); -#ifdef TF_POOLABLE bool IsItemFlag( sal_uInt16 nWhich, sal_uInt16 nFlag ) const; bool IsItemFlag( const SfxPoolItem &rItem, sal_uInt16 nFlag ) const { return IsItemFlag( rItem.Which(), nFlag ); } void SetItemInfos( const SfxItemInfo *pInfos ) { pItemInfos = pInfos; } -#else -#error "TF_POOLABLE should always be set." -#endif sal_uInt16 GetWhich( sal_uInt16 nSlot, sal_Bool bDeep = sal_True ) const; sal_uInt16 GetSlotId( sal_uInt16 nWhich, sal_Bool bDeep = sal_True ) const; sal_uInt16 GetTrueWhich( sal_uInt16 nSlot, sal_Bool bDeep = sal_True ) const; diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx index 0101720da14d..3e4173279859 100644 --- a/svl/inc/svl/poolitem.hxx +++ b/svl/inc/svl/poolitem.hxx @@ -31,7 +31,6 @@ #include "svl/svldllapi.h" #include -#define TF_POOLABLE #include #include #include diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx index ed0a1151eaa5..4c4a37be0e10 100644 --- a/svl/inc/svl/slstitm.hxx +++ b/svl/inc/svl/slstitm.hxx @@ -55,10 +55,6 @@ public: const std::vector& GetList() const; -#ifndef TF_POOLABLE -#error "TF_POOLABLE should always be set." -#endif - // String-Separator: \n virtual void SetString( const XubString& ); virtual XubString GetString(); diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 900b7c2e11b7..032a9cd579fd 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -109,17 +109,10 @@ SfxItemPool::SfxItemPool im File-Format */ sal_uInt16 nStartWhich, /* erste Which-Id des Pools */ sal_uInt16 nEndWhich, /* letzte Which-Id des Pools */ -#ifdef TF_POOLABLE const SfxItemInfo* pInfos, /* SID-Map und Item-Flags */ -#else -#error "TF_POOLABLE should always be set." -#endif SfxPoolItem** pDefaults, /* Pointer auf statische Defaults, wird direkt vom Pool referenziert, jedoch kein Eigent"umer"ubergang */ -#ifndef TF_POOLABLE -#error "TF_POOLABLE should always be set." -#endif bool bLoadRefCounts /* Ref-Counts mitladen oder auf 1 setzen */ ) : @@ -154,11 +147,7 @@ SfxItemPool::SfxItemPool */ -#ifdef TF_POOLABLE pItemInfos(pInfos), -#else -#error "TF_POOLABLE should always be set." -#endif pImp( new SfxItemPool_Impl( this, rName, nStartWhich, nEndWhich ) ) { DBG_CTOR(SfxItemPool, 0); @@ -203,11 +192,7 @@ SfxItemPool::SfxItemPool */ -#ifdef TF_POOLABLE pItemInfos(rPool.pItemInfos), -#else -#error "TF_POOLABLE should always be set." -#endif pImp( new SfxItemPool_Impl( this, rPool.pImp->aName, rPool.pImp->mnStart, rPool.pImp->mnEnd ) ) { DBG_CTOR(SfxItemPool, 0); @@ -767,7 +752,6 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich pNewItem->SetWhich(nWhich); #ifdef DBG_UTIL SFX_ASSERT( rItem.Type() == pNewItem->Type(), nWhich, "unequal types in Put(): no Clone()?" ) -#ifdef TF_POOLABLE if ( !rItem.ISA(SfxSetItem) ) { SFX_ASSERT( !IsItemFlag(nWhich, SFX_ITEM_POOLABLE) || @@ -777,9 +761,6 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich *pNewItem == rItem, nWhich, "unequal items in Put(): no operator==?" ); } -#else -#error "TF_POOLABLE should always be set." -#endif #endif AddRef( *pNewItem, pImp->nInitRefCount ); @@ -1001,14 +982,10 @@ sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, sal_Bool bDeep ) const if ( !IsSlot(nSlotId) ) return nSlotId; -#ifdef TF_POOLABLE sal_uInt16 nCount = pImp->mnEnd - pImp->mnStart + 1; for ( sal_uInt16 nOfs = 0; nOfs < nCount; ++nOfs ) if ( pItemInfos[nOfs]._nSID == nSlotId ) return nOfs + pImp->mnStart; -#else -#error "TF_POOLABLE should always be set." -#endif if ( pImp->mpSecondary && bDeep ) return pImp->mpSecondary->GetWhich(nSlotId); return nSlotId; @@ -1028,13 +1005,9 @@ sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, sal_Bool bDeep ) const SFX_ASSERT( 0, nWhich, "unknown Which-Id - cannot get slot-id" ); return 0; } -#ifdef TF_POOLABLE sal_uInt16 nSID = pItemInfos[nWhich - pImp->mnStart]._nSID; return nSID ? nSID : nWhich; -#else -#error "TF_POOLABLE should always be set." -#endif } // ----------------------------------------------------------------------- @@ -1044,14 +1017,10 @@ sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, sal_Bool bDeep ) const if ( !IsSlot(nSlotId) ) return 0; -#ifdef TF_POOLABLE sal_uInt16 nCount = pImp->mnEnd - pImp->mnStart + 1; for ( sal_uInt16 nOfs = 0; nOfs < nCount; ++nOfs ) if ( pItemInfos[nOfs]._nSID == nSlotId ) return nOfs + pImp->mnStart; -#else -#error "TF_POOLABLE should always be set." -#endif if ( pImp->mpSecondary && bDeep ) return pImp->mpSecondary->GetTrueWhich(nSlotId); return 0; @@ -1071,11 +1040,7 @@ sal_uInt16 SfxItemPool::GetTrueSlotId( sal_uInt16 nWhich, sal_Bool bDeep ) const SFX_ASSERT( 0, nWhich, "unknown Which-Id - cannot get slot-id" ); return 0; } -#ifdef TF_POOLABLE return pItemInfos[nWhich - pImp->mnStart]._nSID; -#else -#error "TF_POOLABLE should always be set." -#endif } sal_uInt16 SfxItemPool::GetFileFormatVersion() const diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index e342ee3a3e99..d719e9801ec8 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -196,11 +196,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const // !poolable wird gar nicht im Pool gespeichert // und itemsets/plain-items je nach Runde -#ifdef TF_POOLABLE if ( *itrArr && IsItemFlag(**ppDefItem, SFX_ITEM_POOLABLE) && -#else -#error "TF_POOLABLE should always be set." -#endif pImp->bInSetItem == (*ppDefItem)->ISA(SfxSetItem) ) { // eigene Kennung, globale Which-Id und Item-Version diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 8fecea15bfa3..c0122f6a4f92 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -187,11 +187,6 @@ int SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const return rCmp.Type() == Type(); } -// ----------------------------------------------------------------------- -#ifndef TF_POOLABLE -#error "TF_POOLABLE should always be set." -#endif - // ----------------------------------------------------------------------- SfxPoolItem* SfxPoolItem::Create(SvStream &, sal_uInt16) const { diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 8bf6776d0a5b..13bdb9c62af7 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -283,16 +283,6 @@ XubString SfxStringListItem::GetString() //------------------------------------------------------------------------ -#ifndef TF_POOLABLE - -int SfxStringListItem::IsPoolable() const -{ - return sal_False; -} - -#endif - -//---------------------------------------------------------------------------- void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< rtl::OUString >& rList ) { DBG_ASSERT(GetRefCount()==0,"SetString:RefCount!=0");