summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-05-02 14:21:41 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-06-04 10:07:00 +0200
commit5ad5f5ec62cc259f054b7343d7b4edce372e95e2 (patch)
tree3a7dc8956afc8841d7c7a30e37a7674496ce1557 /sfx2
parent2bffccf7af58a4c076c597f847eed2068574e704 (diff)
make CreateStyleFamilies return std::unique_ptr
Change-Id: Ibb7bec9ede8045a6cea42c02f61f14ad36d2b434 Reviewed-on: https://gerrit.libreoffice.org/53730 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/mgetempl.cxx2
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 2b29c7e335d1..d930bab81598 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -92,7 +92,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx
else
m_pEditLinkStyleBtn->Enable();
- pFamilies.reset(SfxApplication::GetModule_Impl()->CreateStyleFamilies());
+ pFamilies = SfxApplication::GetModule_Impl()->CreateStyleFamilies();
SfxStyleSheetBasePool* pPool = nullptr;
SfxObjectShell* pDocShell = SfxObjectShell::Current();
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 3b9f53f6431c..07e52540baba 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -704,7 +704,7 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
pCurObjShell = pViewFrame->GetObjectShell();
pModule = pCurObjShell ? pCurObjShell->GetModule() : nullptr;
if (pModule)
- pStyleFamilies.reset(pModule->CreateStyleFamilies());
+ pStyleFamilies = pModule->CreateStyleFamilies();
if (!pStyleFamilies)
pStyleFamilies.reset(new SfxStyleFamilies);