summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2019-02-20 12:45:44 +0100
committerAndras Timar <andras.timar@collabora.com>2019-03-18 10:09:47 +0100
commitdf3a97ac7c430d50aba92d1a684d3e06005da5fd (patch)
tree967861f6abaf4c0f80ba9eda91c2321a528b3481
parenteac303d9b4081f5e13a3b8dd7cad6da67e1f27e7 (diff)
MSForms: Update cursor position after the drop down form field was changed
Change-Id: I0e9e8a0e9212cdf539caa163f9071bc2f21e4c9f Reviewed-on: https://gerrit.libreoffice.org/68959 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 499501e8cf1d511eb95a7b72b755c2dc69985719) Reviewed-on: https://gerrit.libreoffice.org/69193 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--sw/inc/crsrsh.hxx8
-rw-r--r--sw/source/uibase/shells/textsh1.cxx1
2 files changed, 5 insertions, 4 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index fd75609f057f..13d70e6368c6 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -163,6 +163,10 @@ public:
READONLY = (1 << 3) ///< make visible in spite of Readonly
};
+ SAL_DLLPRIVATE void UpdateCursor(
+ sal_uInt16 eFlags = SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE,
+ bool bIdleEnd = false );
+
private:
SwRect m_aCharRect; ///< Char-SRectangle on which the cursor is located
@@ -233,10 +237,6 @@ private:
SwFrame* m_oldColFrame;
- SAL_DLLPRIVATE void UpdateCursor(
- sal_uInt16 eFlags = SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE,
- bool bIdleEnd = false );
-
SAL_DLLPRIVATE void MoveCursorToNum();
SAL_DLLPRIVATE void ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing );
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index cf789346a410..a6495ea935de 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1404,6 +1404,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
pDlg->Execute();
pFieldBM->Invalidate();
rWrtSh.InvalidateWindows( rWrtSh.GetView().GetVisArea() );
+ rWrtSh.UpdateCursor(); // cursor position might be invalid
}
else
{