diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-06 13:21:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-06 16:22:43 +0200 |
| commit | 79ae6cc6b3b19252473f6987106ea7d8aa17a5ea (patch) | |
| tree | ad487826806e9d5aae290da6897c548a0cfcdb35 /include | |
| parent | 2afdea17162731888ad8f09fae2bb50e4246d7e9 (diff) | |
Resolves: tdf#116713 Revert "loplugin:useuniqueptr in SdrObjEditView"
pTextEditOutliner.release() sets pTextEditOutliner to null, so in
SvxTextEditSourceImpl::dispose() mpView->GetTextEditOutliner() returns
null and the SvxTextEditSourceImpl doesn't deregister
This reverts commit 2affed9bfd72628549df3049ed9f6e6a30fdb5b8.
Change-Id: If97c4113db34184b315178546f1fccfada14cc09
Reviewed-on: https://gerrit.libreoffice.org/52503
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -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 2c8710a90af0..324a611d96eb 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; - std::unique_ptr<SdrOutliner> pTextEditOutliner; // outliner for the TextEdit + 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.get(); } - SdrOutliner* GetTextEditOutliner() { return pTextEditOutliner.get(); } + const SdrOutliner* GetTextEditOutliner() const { return pTextEditOutliner; } + SdrOutliner* GetTextEditOutliner() { return pTextEditOutliner; } const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; } OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; } |