strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

svarray: #i112395#: #i84159# new const: SFX_ITEMS_DEFAULT

Browse source
This commit is contained in:
Bartosz Kosiorek 2010-10-19 20:40:04 +02:00
parent 20b24c6bc4
commit a1936ae4d7
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
svl/inc/svl/poolitem.hxx
View file

@ -52,9 +52,10 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
static const sal_uInt32 SFX_ITEMS_DIRECT= 0xffffffff;
static const sal_uInt32 SFX_ITEMS_NULL= 0xfffffff0; // instead StoreSurrogate
static const sal_uInt32 SFX_ITEMS_DEFAULT= 0xfffffffe;
#define SFX_ITEMS_POOLDEFAULT 0xffff
#define SFX_ITEMS_STATICDEFAULT 0xfffe //FIXME It is used in sc/source/ui/unoobj/defltuno.cxx (Should be changed to sal_uInt32 ?)
#define SFX_ITEMS_STATICDEFAULT 0xfffe
#define SFX_ITEMS_DELETEONIDLE 0xfffd
#define SFX_ITEMS_OLD_MAXREF 0xffef

2
svl/source/items/itempool.cxx
View file

@ -1017,7 +1017,7 @@ const SfxPoolItem *SfxItemPool::GetItem2(USHORT nWhich, sal_uInt32 nOfst) const
}
// dflt-Attribut?
if ( nOfst == SFX_ITEMS_STATICDEFAULT )
if ( nOfst == SFX_ITEMS_DEFAULT )
return *(ppStaticDefaults + GetIndex_Impl(nWhich));
SfxPoolItemArray_Impl* pItemArr = *(pImp->ppPoolItems + GetIndex_Impl(nWhich));

4
svl/source/items/poolio.cxx
View file

@ -1114,7 +1114,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
if ( pTarget->IsInRange(rWhich) )
{
// dflt-Attribut?
if ( SFX_ITEMS_STATICDEFAULT == nSurrogat )
if ( SFX_ITEMS_DEFAULT == nSurrogat )
return *(pTarget->ppStaticDefaults +
pTarget->GetIndex_Impl(rWhich));
@ -1210,7 +1210,7 @@ sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const
// Pointer auf static- oder pool-dflt-Attribut?
if( IsStaticDefaultItem(pItem) || IsPoolDefaultItem(pItem) )
return SFX_ITEMS_STATICDEFAULT;
return SFX_ITEMS_DEFAULT;
SfxPoolItemArray_Impl* pItemArr = *(pImp->ppPoolItems + GetIndex_Impl(pItem->Which()));
DBG_ASSERT(pItemArr, "ItemArr is not available");