summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-04-25 20:09:47 +0200
committerCaolán McNamara <caolanm@redhat.com>2014-04-30 08:19:54 +0000
commitd1782bfa94e1f526b90587b74f51b236b3b774c7 (patch)
tree6d97fcd51eeb5e5d189f8cd01c1b38911cde4090
parentfbd7c65a16a2f46ee388795e1bb397a719627b9a (diff)
fdo#60967: fix deletion of paragraph following table
Surprisingly MovePara(fnParaCurr, fnParaEnd) actually moves to the end of the next paragraph if the current one is empty. Change-Id: I780bf663b19044252f1d4532d5467c3a599c8a49 (cherry picked from commit f5fb361df94449850a83be3b412f68e1f9b949c5) Reviewed-on: https://gerrit.libreoffice.org/9195 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/ui/wrtsh/delete.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index bba3c3d369d3..a9928aa834ad 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -466,7 +466,10 @@ long SwWrtShell::DelToEndOfSentence()
if (SwCrsrShell::Right(1,CRSR_SKIP_CHARS))
{
SetMark();
- SwCrsrShell::MovePara(fnParaCurr, fnParaEnd);
+ if (!IsEndPara()) // can only be at the end if it's empty
+ { // for an empty paragraph this would actually select the _next_
+ SwCrsrShell::MovePara(fnParaCurr, fnParaEnd);
+ }
if (!IsEndOfDoc()) // do not delete last paragraph in body text
{
nRet = DelFullPara() ? 1 : 0;