diff options
| author | Bartosz Kosiorek <gang65@openoffice.org> | 2010-10-18 22:00:21 +0200 |
|---|---|---|
| committer | Bartosz Kosiorek <gang65@openoffice.org> | 2010-10-18 22:00:21 +0200 |
| commit | 20b24c6bc448de513dc8adb4b5c1de6c8e4f0cfd (patch) | |
| tree | 4a278e7548da82b91b98700794c334bc872e3763 | |
| parent | fa565a01041d302fb0376fcafae69f2cbd0deb59 (diff) | |
svarray: #i112395# #i84159# increase max number of pools to 2^32
| -rw-r--r-- | svl/inc/svl/itempool.hxx | 4 | ||||
| -rw-r--r-- | svl/inc/svl/poolitem.hxx | 2 | ||||
| -rw-r--r-- | svl/source/items/poolio.cxx | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index 0713a67a0a78..daaa2b481ba3 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -209,8 +209,8 @@ public: FASTBOOL bDirect = FALSE ) const; sal_uInt32 GetSurrogate(const SfxPoolItem *) const; - const SfxPoolItem * GetItem2(USHORT nWhich, sal_uInt32 nSurrogate) const; //this name will be changed to GetItem - sal_uInt32 GetItemCount2(USHORT nWhich) const; //this name will be changed to GetItemCount + const SfxPoolItem * GetItem2(USHORT nWhich, sal_uInt32 nSurrogate) const; + sal_uInt32 GetItemCount2(USHORT nWhich) const; const SfxPoolItem* LoadSurrogate(SvStream& rStream, USHORT &rWhich, USHORT nSlotId, const SfxItemPool* pRefPool = 0 ); diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx index a64f1088aa87..fdff1255184c 100644 --- a/svl/inc/svl/poolitem.hxx +++ b/svl/inc/svl/poolitem.hxx @@ -54,7 +54,7 @@ static const sal_uInt32 SFX_ITEMS_DIRECT= 0xffffffff; static const sal_uInt32 SFX_ITEMS_NULL= 0xfffffff0; // instead StoreSurrogate #define SFX_ITEMS_POOLDEFAULT 0xffff -#define SFX_ITEMS_STATICDEFAULT 0xfffe +#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_DELETEONIDLE 0xfffd #define SFX_ITEMS_OLD_MAXREF 0xffef diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index b974ea806261..a49f90ecde38 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -430,7 +430,7 @@ void SfxItemPool::readTheItems ( *ppArr = pNewArr; // die Items merken, die schon im Pool sind - FASTBOOL bEmpty = TRUE; + bool bEmpty = true; if ( 0 != pOldArr ) for ( n = 0; bEmpty && n < pOldArr->size(); ++n ) bEmpty = pOldArr->operator[](n) == 0; @@ -444,7 +444,7 @@ void SfxItemPool::readTheItems ( if ( pOldItem ) { sal_uInt32 nFree = SAL_MAX_UINT32; - FASTBOOL bFound = FALSE; + bool bFound = false; for ( size_t nNew = (*ppArr)->size(); nNew--; ) { // geladenes Item @@ -463,7 +463,7 @@ void SfxItemPool::readTheItems ( SetRefCount( *rpNewItem, 0 ); delete rpNewItem; rpNewItem = pOldItem; - bFound = TRUE; + bFound = true; break; } } @@ -936,7 +936,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) SfxPoolItem *pOldItem = (*pOldArr)[nOld]; if ( pOldItem ) { - FASTBOOL bFound = FALSE; + bool bFound = false; for ( size_t nNew = 0; nNew < (*ppArr)->size(); ++nNew ) { @@ -949,7 +949,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) SetRefCount( *rpNewItem, 0 ); delete rpNewItem; rpNewItem = pOldItem; - bFound = TRUE; + bFound = true; SFX_TRACE( "reusing item", pOldItem ); break; } |