diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-02 13:00:30 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-02 13:58:07 +0200 |
commit | be48eb2e82a3d8891ee84145567e2b89884f1fd6 (patch) | |
tree | 17e123be98ce578c3ff10c31a275141dfe2e3afa /svx/source/svdraw/svdmodel.cxx | |
parent | f66edd357c4572fd69d42c2330f922ec2beaa415 (diff) |
return std::unique_ptr from SdrMakeOutliner
and some of its callers
Change-Id: I121a7810e3e35e76da4ffe5fc5405a7bf86cb66d
Reviewed-on: https://gerrit.libreoffice.org/53728
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/svdraw/svdmodel.cxx')
-rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index ccb3e52d3416..47fdc5fa4e92 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -198,15 +198,15 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe // can't create DrawOutliner OnDemand, because I can't get the Pool, // then (only from 302 onwards!) - pDrawOutliner.reset(SdrMakeOutliner(OutlinerMode::TextObject, *this)); + pDrawOutliner = SdrMakeOutliner(OutlinerMode::TextObject, *this); ImpSetOutlinerDefaults(pDrawOutliner.get(), true); - pHitTestOutliner.reset(SdrMakeOutliner(OutlinerMode::TextObject, *this)); + pHitTestOutliner = SdrMakeOutliner(OutlinerMode::TextObject, *this); ImpSetOutlinerDefaults(pHitTestOutliner.get(), true); /* Start Text Chaining related code */ // Initialize Chaining Outliner - pChainingOutliner.reset(SdrMakeOutliner( OutlinerMode::TextObject, *this )); + pChainingOutliner = SdrMakeOutliner( OutlinerMode::TextObject, *this ); ImpSetOutlinerDefaults(pChainingOutliner.get(), true); // Make a TextChain @@ -1861,7 +1861,7 @@ void SdrModel::ReformatAllTextObjects() ImpReformatAllTextObjects(); } -SdrOutliner* SdrModel::createOutliner( OutlinerMode nOutlinerMode ) +std::unique_ptr<SdrOutliner> SdrModel::createOutliner( OutlinerMode nOutlinerMode ) { if( !mpOutlinerCache ) mpOutlinerCache.reset(new SdrOutlinerCache(this)); |