Kaydet (Commit) abbd8994 authored tarafından himajin100000's avatar himajin100000 Kaydeden (comit) Noel Grandin

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/52160Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst e82f9e3d
...@@ -334,10 +334,16 @@ private: ...@@ -334,10 +334,16 @@ private:
std::map< const SfxItemSet*, Node > maRoot; std::map< const SfxItemSet*, Node > maRoot;
// #i86923# // #i86923#
std::unique_ptr<SfxItemSet> mpIgnorableItems; std::unique_ptr<SfxItemSet> mpIgnorableItems;
#ifdef DEBUG
sal_Int32 mnCount;
#endif
public: public:
// #i86923# // #i86923#
explicit StylePoolImpl( SfxItemSet const * pIgnorableItems ) explicit StylePoolImpl( SfxItemSet const * pIgnorableItems )
: maRoot(), : maRoot(),
#ifdef DEBUG
mnCount(0),
#endif
mpIgnorableItems( pIgnorableItems != nullptr mpIgnorableItems( pIgnorableItems != nullptr
? pIgnorableItems->Clone( false ) ? pIgnorableItems->Clone( false )
: nullptr ) : nullptr )
...@@ -355,6 +361,7 @@ public: ...@@ -355,6 +361,7 @@ public:
bool bSkipIgnorableItems ); bool bSkipIgnorableItems );
}; };
std::shared_ptr<SfxItemSet> StylePoolImpl::insertItemSet( const SfxItemSet& rSet ) std::shared_ptr<SfxItemSet> StylePoolImpl::insertItemSet( const SfxItemSet& rSet )
{ {
bool bNonPoolable = false; bool bNonPoolable = false;
...@@ -400,6 +407,9 @@ std::shared_ptr<SfxItemSet> StylePoolImpl::insertItemSet( const SfxItemSet& rSet ...@@ -400,6 +407,9 @@ std::shared_ptr<SfxItemSet> StylePoolImpl::insertItemSet( const SfxItemSet& rSet
{ {
pCurNode->setItemSet( rSet ); pCurNode->setItemSet( rSet );
bNonPoolable = false; // to avoid a double insertion 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 rSet contains at least one non poolable item, a new itemset has to be inserted
if( bNonPoolable ) if( bNonPoolable )
...@@ -407,7 +417,7 @@ std::shared_ptr<SfxItemSet> StylePoolImpl::insertItemSet( const SfxItemSet& rSet ...@@ -407,7 +417,7 @@ std::shared_ptr<SfxItemSet> StylePoolImpl::insertItemSet( const SfxItemSet& rSet
#ifdef DEBUG #ifdef DEBUG
{ {
sal_Int32 nCheck = -1; sal_Int32 nCheck = -1;
IStylePoolIteratorAccess* pIter = createIterator(); IStylePoolIteratorAccess* pIter = createIterator(false,false);
std::shared_ptr<SfxItemSet> pTemp; std::shared_ptr<SfxItemSet> pTemp;
do do
{ {
......
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