summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-09-27 13:24:38 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-09-27 13:24:38 +0200
commit45fa73f87258f51bf37c92052723c4b99c49dc2d (patch)
tree5c7bb6e2e5ee5ba1f2f7835efeae35cb48ff1cda /sw/source/uibase
parentd3ab1f8499a5e7040ff6bdf85b951bb9a3d6ac40 (diff)
sw: avoid emitting invalid cursor pos during end text edit of comment
A comment text edit (provided by editeng) works with relative twip coordinates, conversion of the cursor position to absolute twips happens in ImpEditView::ShowCursor(), provided that the pOutWin member has a map mode origin that respresents the offset correctly. This is not true during SwSidebarWin::DeactivatePostIt(), the map mode origin is already reset back to 0, so just don't emit callbacks during shutdown, the sw body text cursor will be shown later anyway. Change-Id: I02c15bb9fad99db8e43fd2f37df770dd165be788
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/docvw/SidebarWin.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index 1e815abffa46..0b144e9e1ab8 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -1260,8 +1260,14 @@ void SwSidebarWin::DeactivatePostIt()
mpOutliner->CompleteOnlineSpelling();
SetViewState(ViewState::NORMAL);
+ // Make sure this view doesn't emit LOK callbacks during the update, as the
+ // sidebar window's SidebarTextControl doesn't have a valid twip offset
+ // (map mode origin) during that operation.
+ bool bTiledPainting = mrView.getTiledPainting();
+ mrView.setTiledPainting(true);
// write the visible text back into the SwField
UpdateData();
+ mrView.setTiledPainting(bTiledPainting);
if ( !Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
GetOutlinerView()->SetBackgroundColor(COL_TRANSPARENT);