diff options
| author | Bartosz Kosiorek <gang65@openoffice.org> | 2010-10-19 20:40:04 +0200 |
|---|---|---|
| committer | Bartosz Kosiorek <gang65@openoffice.org> | 2010-10-19 20:40:04 +0200 |
| commit | a1936ae4d72cd8695c0424a289ca9b91c363cbcf (patch) | |
| tree | fcef7933881a0fdc0ec8b777fca735c12aaed55a | |
| parent | 20b24c6bc448de513dc8adb4b5c1de6c8e4f0cfd (diff) | |
svarray: #i112395#: #i84159# new const: SFX_ITEMS_DEFAULT
| -rw-r--r-- | svl/inc/svl/poolitem.hxx | 3 | ||||
| -rw-r--r-- | svl/source/items/itempool.cxx | 2 | ||||
| -rw-r--r-- | svl/source/items/poolio.cxx | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx index fdff1255184c..d78e32877440 100644 --- a/svl/inc/svl/poolitem.hxx +++ b/svl/inc/svl/poolitem.hxx @@ -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 diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 9759b4d38b4b..d8bdeb330776 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -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)); diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index a49f90ecde38..8bf8f2b2434b 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -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"); |