summaryrefslogtreecommitdiff
path: root/svl/source
diff options
context:
space:
mode:
Diffstat (limited to 'svl/source')
-rw-r--r--svl/source/items/itempool.cxx35
-rw-r--r--svl/source/items/poolio.cxx4
-rw-r--r--svl/source/items/poolitem.cxx5
-rw-r--r--svl/source/items/slstitm.cxx10
4 files changed, 0 insertions, 54 deletions
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
<SfxItemPool::ReldaseDefaults(sal_Bool)>
*/
-#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
<SfxItemPool::Clone()const>
*/
-#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
@@ -188,11 +188,6 @@ int SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const
}
// -----------------------------------------------------------------------
-#ifndef TF_POOLABLE
-#error "TF_POOLABLE should always be set."
-#endif
-
-// -----------------------------------------------------------------------
SfxPoolItem* SfxPoolItem::Create(SvStream &, sal_uInt16) const
{
DBG_CHKTHIS(SfxPoolItem, 0);
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");
generated by cgit (git 2.34.1) at 2025-02-02 22:12:26 +0000