sw/source/uibase/utlui/navipi.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 49ce4bf15c1769b7427dd4d828e586c1e896f928
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jun 10 11:58:41 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jun 10 18:31:37 2020 +0200
tdf#132845 discard pending page change if user clicks in document
Change-Id: Icce91c9afac143190dc5c7d823d745dc2434c1a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96013
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/uibase/utlui/navipi.cxx
b/sw/source/uibase/utlui/navipi.cxx
index 997ca0df86e4..0e3af56e48ec 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -405,6 +405,10 @@ bool SwNavigationPI::EditAction()
if (m_aPageChgIdle.IsActive())
m_aPageChgIdle.Stop();
+ // if the user has clicked into the document, forget about changing the
page
+ if (pView->GetEditWin().HasFocus())
+ return false;
+
SwWrtShell &rSh = m_pCreateView->GetWrtShell();
sal_uInt16 nNewPage = m_xEdit->get_value();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
