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

Revert "remove SfxPoolItemArrayBase_Impl typedef"

Browse source 
This reverts commit d141d5b3bd.

seems like I pushed it too soon, it depends on other commits not in yet.
This commit is contained in:
Noel Grandin 2016-09-22 21:12:59 +02:00
parent d141d5b3bd
commit b0eecd2d3b
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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