summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2016-12-11 00:33:07 +0300
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-12-12 03:33:18 +0000
commit53dbc419b2e886b345a3512cf11e035ff2b7651b (patch)
treeab28a45d809cfe20b702257bc7b7f04dede22161
parent634589b340316ba64b731b4d923c1056be415494 (diff)
This patch caused a regression that on creation of a new sheet while there's an unfinished edit of a cell, by using "+" in bottom left corner, that edit is committed to newly created sheet instead of that in which it was performed. Also, fixing original problem (tdf#42432), it forced the pending edit on deleted page to go to an existing page, which could overwrite existing data without being noticed (dataloss). Reverting the patch does not reintroduce the original problem that it intended to fix (a crash) in master. Change-Id: I696a85ec9d08ebb3621ebdbce4d9f71eadcdb2c2 Reviewed-on: https://gerrit.libreoffice.org/31843 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--sc/source/ui/view/tabview3.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 1854e7c6d382..58a846c2ce6e 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1795,6 +1795,7 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
// window (is called from SetCursor)
UpdateShow();
aViewData.ResetOldCursor();
+ SetCursor( aViewData.GetCurX(), aViewData.GetCurY(), true );
SfxBindings& rBindings = aViewData.GetBindings();
ScMarkData& rMark = aViewData.GetMarkData();
@@ -1831,7 +1832,6 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
rBindings.Invalidate( FID_TAB_DESELECTALL );
}
- SetCursor( aViewData.GetCurX(), aViewData.GetCurY(), true );
bool bUnoRefDialog = pScMod->IsRefDialogOpen() && pScMod->GetCurRefDlgId() == WID_SIMPLE_REF;
// recalc zoom-dependent values (before TabChanged, before UpdateEditViewPos)