summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2015-10-03 09:35:26 +0300
committerCaolán McNamara <caolanm@redhat.com>2015-10-09 13:57:18 +0000
commitfb62052d5ac069d700a5410db35d6949a4c4008b (patch)
treec1196bde7be30eb500296e3a475b2ea7a9766712
parent4850edd31afa16401ac7c94d8bd1b02525fbe718 (diff)
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>
-rw-r--r--sw/source/uibase/shells/textsh.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index c9b9aadb5b20..d8adc8d98ca0 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -660,9 +660,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 )
{