summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2021-02-17 15:53:08 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2021-02-18 16:13:17 +0100
commit92d1eaab8adf8de7afa607119770adb042283700 (patch)
treeb3e86c03c64374dfcf2d9b65c124adb276e85f47 /svx
parentfd745457be6371794ca8178631ecb3523c9474cd (diff)
Better fix for tdf#125824: switch page only for the current view.
First workaround was avoiding undoing: 9dca7c2fac5c6b83a6910aa61b1a2a316f36d948 Second workaround was forcing all views to exit text editing: e6c7a018a0cfee395ce2886d41c908a2447ef5cc Instead of these solutions, we allow to continue text editing in other views. What we do is avoiding jumping to the object location in all views while undoing. In theory, the two views / windows should be able to edit the document's different parts independently. So one view should not jump to the location where the other view edits something / does an undo. It works both with multi-window and Collabora Online's collaborative editing. Change-Id: I7ffe29bf175b8f855fe3e92b3d7e11ca6bcd3f5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111073 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 7db8c3d36db3ed727ade2609b7c1017cc813a560) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111112 Tested-by: Jenkins
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdedxv.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 15dac1b614ee..268981f99df0 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1523,7 +1523,6 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
const bool bUndo = IsUndoEnabled();
if (bUndo)
{
- EndTextEditAllViews();
OUString aObjName(pTEObj->TakeObjNameSingul());
BegUndo(SvxResId(STR_UndoObjSetText), aObjName);
}