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

Revert "Revert "remove SfxPoolItemArrayBase_Impl typedef""

Browse source 
This reverts commit b0eecd2d3b.

Now that the necessary parent commits are in, we can re-apply this.
This commit is contained in:
Noel Grandin 2016-09-23 08:57:22 +02:00
parent 373b44a2fc
commit e85d92a874
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
svl/source/inc/poolio.hxx
View file

@ -58,8 +58,6 @@ struct SfxPoolVersion_Impl
{} {}
}; };
typedef std::vector<SfxPoolItem*> SfxPoolItemArrayBase_Impl;
typedef std::shared_ptr< SfxPoolVersion_Impl > SfxPoolVersion_ImplPtr; typedef std::shared_ptr< SfxPoolVersion_Impl > SfxPoolVersion_ImplPtr;
/** /**
@ -121,7 +119,7 @@ struct SfxItemPool_Impl
bool mbPersistentRefCounts; bool mbPersistentRefCounts;
SfxItemPool_Impl( SfxItemPool* pMaster, const OUString& rName, sal_uInt16 nStart, sal_uInt16 nEnd ) SfxItemPool_Impl( SfxItemPool* pMaster, const OUString& rName, sal_uInt16 nStart, sal_uInt16 nEnd )
: maPoolItems(nEnd - nStart + 1, static_cast<SfxPoolItemArray_Impl*>(nullptr)) : maPoolItems(nEnd - nStart + 1)
, aName(rName) , aName(rName)
, maPoolDefaults(nEnd - nStart + 1) , maPoolDefaults(nEnd - nStart + 1)
, ppStaticDefaults(nullptr) , ppStaticDefaults(nullptr)

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

@ -641,7 +641,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
pItemArr = pImpl->maPoolItems[nIndex]; pItemArr = pImpl->maPoolItems[nIndex];
} }
SfxPoolItemArrayBase_Impl::iterator ppFree; std::vector<SfxPoolItem*>::iterator ppFree;
bool ppFreeIsSet = false; bool ppFreeIsSet = false;
// Is this a 'poolable' item - ie. should we re-use and return // Is this a 'poolable' item - ie. should we re-use and return
@ -688,7 +688,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
// Unconditionally insert; check for a recently freed place // Unconditionally insert; check for a recently freed place
if (pItemArr->maFree.size() > 0) if (pItemArr->maFree.size() > 0)
{ {
SfxPoolItemArrayBase_Impl::iterator itr = pItemArr->begin(); auto itr = pItemArr->begin();
sal_uInt32 nIdx = pItemArr->maFree.back(); sal_uInt32 nIdx = pItemArr->maFree.back();
pItemArr->maFree.pop_back(); pItemArr->maFree.pop_back();