diff options
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/stylepool.cxx | 4 | ||||
| -rw-r--r-- | svl/source/numbers/zforfind.hxx | 2 | ||||
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index 6df2501673ac..8ac1e4f96f19 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.cxx @@ -69,7 +69,7 @@ namespace { void setItemSet( const SfxItemSet& rSet ){ maItemSet.push_back( std::shared_ptr<SfxItemSet>( rSet.Clone() ) ); } // #i86923# Node* findChildNode( const SfxPoolItem& rItem, - const bool bIsItemIgnorable = false ); + const bool bIsItemIgnorable ); Node* nextItemSet( Node* pLast, const bool bSkipUnusedItemSet, const bool bSkipIgnorable ); @@ -396,7 +396,7 @@ std::shared_ptr<SfxItemSet> StylePoolImpl::insertItemSet( const SfxItemSet& rSet if ( !xFoundIgnorableItems.get() || (xFoundIgnorableItems->Put( *pItem ) == nullptr ) ) { - pCurNode = pCurNode->findChildNode( *pItem ); + pCurNode = pCurNode->findChildNode( *pItem, false ); } pItem = aIter.NextItem(); } diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx index 5f62e281f10c..ba24b87bb98e 100644 --- a/svl/source/numbers/zforfind.hxx +++ b/svl/source/numbers/zforfind.hxx @@ -46,7 +46,7 @@ public: bool IsNumberFormat( const OUString& rString, /// input string short& F_Type, /// format type (in + out) double& fOutNumber, /// value determined (out) - const SvNumberformat* pFormat = nullptr); /// optional a number format to which compare against + const SvNumberformat* pFormat); /// optional a number format to which compare against /// after IsNumberFormat: get decimal position short GetDecPos() const { return nDecPos; } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index ce018a1f00a8..3274ae392d16 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -674,7 +674,7 @@ SvNumberformat::SvNumberformat(OUString& rString, if (nAnzChars > 0) { short F_Type = css::util::NumberFormat::UNDEFINED; - if (!pISc->IsNumberFormat(sStr,F_Type,fNumber) || + if (!pISc->IsNumberFormat(sStr, F_Type, fNumber, nullptr) || ( F_Type != css::util::NumberFormat::NUMBER && F_Type != css::util::NumberFormat::SCIENTIFIC) ) { |