Kaydet (Commit) b0eecd2d authored tarafından Noel Grandin's avatar Noel Grandin

Revert "remove SfxPoolItemArrayBase_Impl typedef"

This reverts commit d141d5b3.

seems like I pushed it too soon, it depends on other commits not in yet.
üst d141d5b3
...@@ -58,6 +58,8 @@ struct SfxPoolVersion_Impl ...@@ -58,6 +58,8 @@ 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;
/** /**
...@@ -110,7 +112,7 @@ struct SfxItemPool_Impl ...@@ -110,7 +112,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) : maPoolItems(nEnd - nStart + 1, static_cast<SfxPoolItemArray_Impl*>(nullptr))
, aName(rName) , aName(rName)
, maPoolDefaults(nEnd - nStart + 1) , maPoolDefaults(nEnd - nStart + 1)
, ppStaticDefaults(nullptr) , ppStaticDefaults(nullptr)
......
...@@ -646,7 +646,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich ...@@ -646,7 +646,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
pItemArr = pImpl->maPoolItems[nIndex]; pItemArr = pImpl->maPoolItems[nIndex];
} }
std::vector<SfxPoolItem*>::iterator ppFree; SfxPoolItemArrayBase_Impl::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
...@@ -693,7 +693,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich ...@@ -693,7 +693,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)
{ {
auto itr = pItemArr->begin(); SfxPoolItemArrayBase_Impl::iterator itr = pItemArr->begin();
sal_uInt32 nIdx = pItemArr->maFree.back(); sal_uInt32 nIdx = pItemArr->maFree.back();
pItemArr->maFree.pop_back(); pItemArr->maFree.pop_back();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment