diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-22 21:12:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-22 21:12:59 +0200 |
| commit | b0eecd2d3ba4a1a424a2d52cccf64fe6fc09c34b (patch) | |
| tree | 8f6b2ae02ccc0ee8a72dae8a652493f8e087cadd /svl | |
| parent | d141d5b3bd11ba6154b5d064fb69900405724b13 (diff) | |
Revert "remove SfxPoolItemArrayBase_Impl typedef"
This reverts commit d141d5b3bd11ba6154b5d064fb69900405724b13.
seems like I pushed it too soon, it depends on other commits not in yet.
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/inc/poolio.hxx | 4 | ||||
| -rw-r--r-- | svl/source/items/itempool.cxx | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index ec3ec8349c78..627fd6ba62ab 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -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) diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 7a38d451acf7..6f4a6f210ad7 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -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(); |