From 9ca3a372a45d146acb8efdda5c02bd10e1a14ab3 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 3 May 2020 20:27:16 +0100 Subject: default CreateIterator mask to SfxStyleSearchBits::All MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie79eff57646853613e8c6060adbce92dd388df5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93357 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- include/svl/style.hxx | 2 +- sc/source/core/data/patattr.cxx | 2 +- sc/source/core/data/stlsheet.cxx | 2 +- sc/source/filter/xml/xmlfonte.cxx | 2 +- sw/inc/docstyle.hxx | 2 +- sw/source/core/unocore/unostyle.cxx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 1c71e0d39478..9b8c06d3f782 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -258,7 +258,7 @@ public: SfxItemPool& GetPool() { return rPool;} const SfxItemPool& GetPool() const { return rPool;} - virtual std::unique_ptr CreateIterator(SfxStyleFamily, SfxStyleSearchBits nMask); + virtual std::unique_ptr CreateIterator(SfxStyleFamily, SfxStyleSearchBits nMask = SfxStyleSearchBits::All); sal_uInt16 Count(); SfxStyleSheetBase* operator[](sal_uInt16 nIdx); diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index fc562b4b6092..3ac2bdcf4f96 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -1204,7 +1204,7 @@ void ScPatternAttr::UpdateStyleSheet(const ScDocument* pDoc) // Assumes that "Standard" is always the 1st entry! if (!pStyle) { - std::unique_ptr pIter = pDoc->GetStyleSheetPool()->CreateIterator( SfxStyleFamily::Para, SfxStyleSearchBits::All ); + std::unique_ptr pIter = pDoc->GetStyleSheetPool()->CreateIterator(SfxStyleFamily::Para); pStyle = dynamic_cast< ScStyleSheet* >(pIter->First()); } diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index bda09b05e0ba..6175712c5c0a 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -92,7 +92,7 @@ bool ScStyleSheet::SetParent( const OUString& rParentName ) SfxStyleSheetBase* pStyle = m_pPool->Find( aEffName, nFamily ); if (!pStyle) { - std::unique_ptr pIter = m_pPool->CreateIterator( nFamily, SfxStyleSearchBits::All ); + std::unique_ptr pIter = m_pPool->CreateIterator(nFamily); pStyle = pIter->First(); if (pStyle) aEffName = pStyle->GetName(); diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx index 22b31e73f27e..754c6471798f 100644 --- a/sc/source/filter/xml/xmlfonte.cxx +++ b/sc/source/filter/xml/xmlfonte.cxx @@ -86,7 +86,7 @@ ScXMLFontAutoStylePool_Impl::ScXMLFontAutoStylePool_Impl(ScXMLExport& rExportP, const SfxItemPool* pEditPool(rExportP.GetDocument()->GetEditPool()); AddFontItems(aEditWhichIds, 3, pEditPool, false); - std::unique_ptr pItr = rExportP.GetDocument()->GetStyleSheetPool()->CreateIterator(SfxStyleFamily::Page, SfxStyleSearchBits::All); + std::unique_ptr pItr = rExportP.GetDocument()->GetStyleSheetPool()->CreateIterator(SfxStyleFamily::Page); m_bEmbedUsedOnly = rExportP.GetDocument()->IsEmbedUsedFontsOnly(); m_bEmbedLatinScript = rExportP.GetDocument()->IsEmbedFontScriptLatin(); diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index d3160b6e54a7..229ed37e0e32 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -217,7 +217,7 @@ public: bool IsOrganizerMode() const { return bOrganizer; } - virtual std::unique_ptr CreateIterator( SfxStyleFamily, SfxStyleSearchBits nMask ) override; + virtual std::unique_ptr CreateIterator( SfxStyleFamily, SfxStyleSearchBits nMask = SfxStyleSearchBits::All) override; SwDoc& GetDoc() const { return rDoc; } diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 90a0f5a97d40..c57249326b32 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -906,7 +906,7 @@ uno::Sequence XStyleFamily::getElementNames() if(!m_pBasePool) throw uno::RuntimeException(); std::vector vRet; - std::unique_ptr pIt = m_pBasePool->CreateIterator(m_rEntry.m_eFamily, SfxStyleSearchBits::All); + std::unique_ptr pIt = m_pBasePool->CreateIterator(m_rEntry.m_eFamily); for (SfxStyleSheetBase* pStyle = pIt->First(); pStyle; pStyle = pIt->Next()) { OUString sName; -- cgit