diff options
| author | himajin100000 <himajin100000@gmail.com> | 2018-03-28 18:22:40 +0900 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-31 11:02:40 +0200 |
| commit | abbd8994740ee4c51bf473edba7b7dabf72c3a47 (patch) | |
| tree | 9c422e5a66decffd2258276f3b2ddbf8f0200e81 /svl | |
| parent | e82f9e3d39ae31b1dd29a99484b7d125bb03f783 (diff) | |
explicitly pass false as arguments of createIterator
StylePool::createIterator has default paramters,but StylePoolImpl's does not.
Change-Id: I1eff95cd3dc9e9bf7bae04aa78920c2d82acabd8
Reviewed-on: https://gerrit.libreoffice.org/52160
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/stylepool.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index 15fb042ef0e9..f1ddc7e0ab7b 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.cxx @@ -334,10 +334,16 @@ private: std::map< const SfxItemSet*, Node > maRoot; // #i86923# std::unique_ptr<SfxItemSet> mpIgnorableItems; +#ifdef DEBUG + sal_Int32 mnCount; +#endif public: // #i86923# explicit StylePoolImpl( SfxItemSet const * pIgnorableItems ) : maRoot(), +#ifdef DEBUG + mnCount(0), +#endif mpIgnorableItems( pIgnorableItems != nullptr ? pIgnorableItems->Clone( false ) : nullptr ) @@ -355,6 +361,7 @@ public: bool bSkipIgnorableItems ); }; + std::shared_ptr<SfxItemSet> StylePoolImpl::insertItemSet( const SfxItemSet& rSet ) { bool bNonPoolable = false; @@ -400,6 +407,9 @@ std::shared_ptr<SfxItemSet> StylePoolImpl::insertItemSet( const SfxItemSet& rSet { pCurNode->setItemSet( rSet ); bNonPoolable = false; // to avoid a double insertion +#ifdef DEBUG + ++mnCount; +#endif } // If rSet contains at least one non poolable item, a new itemset has to be inserted if( bNonPoolable ) @@ -407,7 +417,7 @@ std::shared_ptr<SfxItemSet> StylePoolImpl::insertItemSet( const SfxItemSet& rSet #ifdef DEBUG { sal_Int32 nCheck = -1; - IStylePoolIteratorAccess* pIter = createIterator(); + IStylePoolIteratorAccess* pIter = createIterator(false,false); std::shared_ptr<SfxItemSet> pTemp; do { |