[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - sw/inc

[Rosemary Sebastian]

 dev/null           |binary
 sw/inc/redline.hxx |    3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 6ef8bbca51c3774596794a6f52aaab29e532c57e
Author: Rosemary Sebastian <rosemary.seb8 at gmail.com>
Date:   Sat Jul 2 18:56:55 2016 +0530

    Clean up code
    
    Change-Id: I637e99315a43a9542988062bdde88f3e033ca8a4

diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 2ebe5cc..fc9fe34a 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -168,8 +168,7 @@ public:
                         pNext->CanCombine( *rCmp.pNext ))) &&
                     (( !pExtraData && !rCmp.pExtraData ) ||
                         ( pExtraData && rCmp.pExtraData &&
-                            *pExtraData == *rCmp.pExtraData )) &&
-                            nUndoEnd == rCmp.nUndoStart - 1;
+                            *pExtraData == *rCmp.pExtraData ));
         }
 
     // ExtraData gets copied, the pointer is therefore not taken over by
diff --git a/sw/inc/redline.hxx.gch b/sw/inc/redline.hxx.gch
deleted file mode 100644
index 1fac9bb..0000000
Binary files a/sw/inc/redline.hxx.gch and /dev/null differ