diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-17 16:13:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-19 15:40:45 +0200 |
| commit | db85d367c266898d4b98fc18c9318b6bcc83725a (patch) | |
| tree | d0799b551e13c0a3cc9a48b5f753adcf4a5fcee3 /sc | |
| parent | bcdebc832b272662d28035007a4796e42d1305ae (diff) | |
return SfxStyleSheetIterator by std::unique_ptr
std::shared_ptr overkill here
Change-Id: I9bd6ee5b92f9c04e0ca48d25eba99e5c232643c7
Reviewed-on: https://gerrit.libreoffice.org/57570
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/patattr.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/stlsheet.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlfonte.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 70070fa52ac4..9dbf1bf83773 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -1173,7 +1173,7 @@ void ScPatternAttr::UpdateStyleSheet(const ScDocument* pDoc) // Assumes that "Standard" is always the 1st entry! if (!pStyle) { - std::shared_ptr<SfxStyleSheetIterator> pIter = pDoc->GetStyleSheetPool()->CreateIterator( SfxStyleFamily::Para, SfxStyleSearchBits::All ); + std::unique_ptr<SfxStyleSheetIterator> pIter = pDoc->GetStyleSheetPool()->CreateIterator( SfxStyleFamily::Para, SfxStyleSearchBits::All ); pStyle = dynamic_cast< ScStyleSheet* >(pIter->First()); } diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index d9a42eb06778..21c24e4ec913 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -97,7 +97,7 @@ bool ScStyleSheet::SetParent( const OUString& rParentName ) SfxStyleSheetBase* pStyle = m_pPool->Find( aEffName, nFamily ); if (!pStyle) { - std::shared_ptr<SfxStyleSheetIterator> pIter = m_pPool->CreateIterator( nFamily, SfxStyleSearchBits::All ); + std::unique_ptr<SfxStyleSheetIterator> pIter = m_pPool->CreateIterator( nFamily, SfxStyleSearchBits::All ); 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 b4c7e7a8808c..eeb50130fbbc 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::shared_ptr<SfxStyleSheetIterator> pItr = rExportP.GetDocument()->GetStyleSheetPool()->CreateIterator(SfxStyleFamily::Page, SfxStyleSearchBits::All); + std::unique_ptr<SfxStyleSheetIterator> pItr = rExportP.GetDocument()->GetStyleSheetPool()->CreateIterator(SfxStyleFamily::Page, SfxStyleSearchBits::All); m_bEmbedUsedOnly = rExportP.GetDocument()->IsEmbedUsedFontsOnly(); m_bEmbedLatinScript = rExportP.GetDocument()->IsEmbedFontScriptLatin(); |