tdf#94679 Writer: fix lost selection with Shift-PageDown

Push/Pop-ing the cursor led to selection loss.
SelectHiddenRange() immediately returns false if the current cursor
hasMark(), so avoid all of the bugs and expensive push/pop routines
when there is a mark already.

Change-Id: I4624a3e0b2267942812d0429d527ad97962ec7fc
Reviewed-on: https://gerrit.libreoffice.org/19108
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit fb62052d5ac069d700a5410db35d6949a4c4008b)
Reviewed-on: https://gerrit.libreoffice.org/19279
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index ae19de5a72e3..6637429e69b3 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -698,9 +698,13 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
     SfxObjectCreateMode eCreateMode =
                         GetView().GetDocShell()->GetCreateMode();
 
-    rSh.Push();
-    const bool bCrsrInHidden = rSh.SelectHiddenRange();
-    rSh.Pop();
+    bool bCrsrInHidden = false;
+    if( !rSh.HasMark() )
+    {
+        rSh.Push();
+        bCrsrInHidden = rSh.SelectHiddenRange();
+        rSh.Pop();
+    }
 
     while ( nWhich )
     {