diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-11 13:18:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-14 08:27:35 +0200 |
| commit | 895c0e9d7a8b67ef7f99b7ccee7c87e9820f16d4 (patch) | |
| tree | 82b85fabbae0261156a519a15994087fa43c45b9 | |
| parent | 2f52a8e0f1098a51631434129707cfb0b60fecb3 (diff) | |
tdf#119793 Crash on redo of rectangle movement and text
regression from
commit be48eb2e82a3d8891ee84145567e2b89884f1fd6
return std::unique_ptr from SdrMakeOutliner
Change-Id: Iec4421558ed29121973c87b9363da0303f71e203
Reviewed-on: https://gerrit.libreoffice.org/60317
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 4926b0f348dd1ddf170fe41df0cde4d426ab3b5f)
Reviewed-on: https://gerrit.libreoffice.org/60441
| -rw-r--r-- | sc/source/ui/drawfunc/futext.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index e9646de57610..1212bba340b3 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -197,11 +197,11 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) pO->SetVertical( bVertical ); //!?? the default values are not correct when result is without outliner ???!? - auto pUndoManager = &pO->GetUndoManager(); + auto pOTemp = pO.get(); if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, true, pO.release()) ) { // subscribe EditEngine-UndoManager - rViewShell.SetDrawTextUndo( pUndoManager ); + rViewShell.SetDrawTextUndo( &pOTemp->GetUndoManager() ); OutlinerView* pOLV = pView->GetTextEditOutlinerView(); if ( pOLV->MouseButtonDown(rMEvt) ) @@ -593,7 +593,7 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel, pO->SetVertical( bVertical ); //!?? without returned Outliner the defaults are not correct ???!? - auto pUndoManager = &pO->GetUndoManager(); + auto pOTemp = pO.get(); if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, true, pO.release()) ) { // Toggle out of paste mode if we are in it, otherwise @@ -603,7 +603,7 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel, rViewShell.UpdateCopySourceOverlay(); // EditEngine-UndoManager anmelden - rViewShell.SetDrawTextUndo( pUndoManager ); + rViewShell.SetDrawTextUndo( &pOTemp->GetUndoManager() ); pView->SetEditMode(); |