summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-04-25 20:09:47 +0200
committerAndras Timar <andras.timar@collabora.com>2014-05-01 12:28:29 +0200
commit3e780c8ab23458c01a5fb7d4faaab96073ef7f6d (patch)
treeb893fe077655059d5adf24329a080c276e6417cc
parentf1c63751e5efa8a702a87f250af9cd5de15f19b8 (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;