diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-28 14:53:32 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-05 15:55:28 +0100 |
commit | 2affed9bfd72628549df3049ed9f6e6a30fdb5b8 (patch) | |
tree | 2447defde1c5587af50c5d7a7aac3ffa8cc7d951 /include/svx/svdedxv.hxx | |
parent | af269d967be348b813ea6d9e5e92a95886143622 (diff) |
loplugin:useuniqueptr in SdrObjEditView
Horrible things happening in SdrObjEditView::SdrEndTextEdit, I
can't tell if it's deliberately leaking there, or just changing
ownership in some terribly opaque way.
Change-Id: Idcb30f7e3f1b801901f727b151d3e8dd1124fd3f
Reviewed-on: https://gerrit.libreoffice.org/50663
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx/svdedxv.hxx')
-rw-r--r-- | include/svx/svdedxv.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 46dd040e0d5a..75bae001cc2e 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -77,7 +77,7 @@ protected: tools::WeakReference<SdrTextObj> mxTextEditObj; // current object in TextEdit SdrPageView* pTextEditPV; - SdrOutliner* pTextEditOutliner; // outliner for the TextEdit + std::unique_ptr<SdrOutliner> pTextEditOutliner; // outliner for the TextEdit OutlinerView* pTextEditOutlinerView; // current view of the outliners VclPtr<vcl::Window> pTextEditWin; // matching window to pTextEditOutlinerView vcl::Cursor* pTextEditCursorMerker; // to restore the cursor in each window @@ -226,8 +226,8 @@ public: // Now at this outliner, events can be send, attributes can be set, // call Cut/Copy/Paste, call Undo/Redo, and so on... - const SdrOutliner* GetTextEditOutliner() const { return pTextEditOutliner; } - SdrOutliner* GetTextEditOutliner() { return pTextEditOutliner; } + const SdrOutliner* GetTextEditOutliner() const { return pTextEditOutliner.get(); } + SdrOutliner* GetTextEditOutliner() { return pTextEditOutliner.get(); } const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; } OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; } |