diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2022-03-09 16:41:36 +0100 |
---|---|---|
committer | Szymon Kłos <szymon.klos@collabora.com> | 2022-03-14 16:04:48 +0100 |
commit | 7fced7bbd0d6d7769dcf13ab326c793d4096a247 (patch) | |
tree | 1a1a86b9117b8813068752c04ce02055c057c747 /svx/source/svdraw | |
parent | 579f3b50bcffe14a5979d76a5316b4f51c76b7ad (diff) |
svx: don't remove object right after insertion
This is regression from:
commit 2d95b3846eac367d2baadc194ab258dc31e7bd33
Author: Tomaz Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Thu Oct 7 16:48:46 2021 +0200
svx: Don't end text edit mode for all views
It was visible with "direct insertion" where user doesn't
need to draw anything but textbox is inserted in the center
of a screen (eg. used in LOK case)
Object was inserted into a view and right after that was removed when
EndTextEditCurrentView was called
Change-Id: I9943d46746aabadf96d76d6e74770b56d648b79d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131263
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131537
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r-- | svx/source/svdraw/svdedtv.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index c59b1e6be864..df42a3d78dea 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -1008,7 +1008,8 @@ bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, SdrInser } if( IsUndoEnabled()) { - EndTextEditCurrentView(); + bool bDontDeleteReally = true; + EndTextEditCurrentView(bDontDeleteReally); AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pObj)); } @@ -1088,13 +1089,13 @@ void SdrEditView::EndTextEditAllViews() const } } -void SdrEditView::EndTextEditCurrentView() +void SdrEditView::EndTextEditCurrentView(bool bDontDeleteReally) { if (IsTextEdit()) { SdrView* pSdrView = dynamic_cast<SdrView*>(this); if (pSdrView) - pSdrView->SdrEndTextEdit(); + pSdrView->SdrEndTextEdit(bDontDeleteReally); } } |