[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/utlui/navipi.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit a4055b5317e42773e8510422826737462290f42f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jun 10 11:58:41 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jun 10 21:41:12 2020 +0200

    tdf#132845 discard pending page change if user clicks in document
    
    Change-Id: Icce91c9afac143190dc5c7d823d745dc2434c1a1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95988
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at 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();