summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-07-26 13:12:31 +0200
committerMike Kaganski <mike.kaganski@collabora.com>2018-07-30 16:42:27 +0200
commit6ee3d32494e165b11a416637a91cf4fc69af5432 (patch)
tree918afcf0041d952da306a64c3b99f8fbc5c95a0d
parentec9b18b75c193c914691a29d3eb78bd81961fced (diff)
tdf#106374: lock view when updating index
Change-Id: I745f8b66cb79c8738dba6fcdd58b8597e604f6fd Reviewed-on: https://gerrit.libreoffice.org/58091 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
-rw-r--r--sw/source/uibase/uiview/view2.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index c71011b737a4..f1866fc3ee16 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -906,11 +906,16 @@ void SwView::Execute(SfxRequest &rReq)
const SwTOXBase* pBase = m_pWrtShell->GetCurTOX();
if(pBase)
{
+ // tdf#106374: don't jump view on the update
+ const bool bWasLocked = m_pWrtShell->IsViewLocked();
+ m_pWrtShell->LockView(true);
m_pWrtShell->StartAction();
if(TOX_INDEX == pBase->GetType())
m_pWrtShell->ApplyAutoMark();
m_pWrtShell->UpdateTableOf( *pBase );
m_pWrtShell->EndAction();
+ if (!bWasLocked)
+ m_pWrtShell->LockView(false);
}
}
break;