[Libreoffice-commits] core.git: sw/source

Michael Stahl mstahl at redhat.com
Sun Apr 27 02:48:04 PDT 2014


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

New commits:
commit f5fb361df94449850a83be3b412f68e1f9b949c5
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

diff --git a/sw/source/core/uibase/wrtsh/delete.cxx b/sw/source/core/uibase/wrtsh/delete.cxx
index 7d95390..e18c453 100644
--- a/sw/source/core/uibase/wrtsh/delete.cxx
+++ b/sw/source/core/uibase/wrtsh/delete.cxx
@@ -462,7 +462,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;


More information about the Libreoffice-commits mailing list