[Libreoffice-commits] core.git: Branch 'feature/sw-delete-undo-rework' - sw/source

Rosemary Sebastian rosemary.seb8 at gmail.com
Thu Aug 31 10:59:07 UTC 2017


 sw/source/core/doc/DocumentRedlineManager.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit deb8df2842f27e45ee26bef9fbecaf28002dc09b
Author: Rosemary Sebastian <rosemary.seb8 at gmail.com>
Date:   Thu Aug 31 16:08:58 2017 +0530

    Fix grouping of the last letter in a word ...
    
    ... when deleting a redline insert in change-tracking mode.
    
    Change-Id: I948a5270962372ea4eaca3b876c4d1b847279346

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 1a62a0b04c64..1e92b43b1301 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1189,11 +1189,6 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                         switch( eCmpPos )
                         {
                         case SwComparePosition::Equal:
-                            bCompress = true;
-                            mpRedlineTable->DeleteAndDestroy( n );
-                            bDec = true;
-                            SAL_FALLTHROUGH;
-
                         case SwComparePosition::Inside:
                             if( bCallDelete )
                             {
@@ -1222,6 +1217,12 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
                             pNewRedl = nullptr;
                             if (eCmpPos == SwComparePosition::Inside)
                                 pRedl->MaybeNotifyModification();
+                            else
+                            {
+                                bCompress = true;
+                                mpRedlineTable->DeleteAndDestroy( n );
+                                bDec = true;
+                            }
                             break;
 
                         case SwComparePosition::Outside:


More information about the Libreoffice-commits mailing list