[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source

[Michael Stahl]

 sw/source/ui/wrtsh/delete.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d1782bfa94e1f526b90587b74f51b236b3b774c7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Apr 25 20:09:47 2014 +0200

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index bba3c3d..a9928aa 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;