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

[Rosemary Sebastian]

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

New commits:
commit deb8df2842f27e45ee26bef9fbecaf28002dc09b
Author: Rosemary Sebastian 
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:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rosemary Sebastian]

Rebased ref, commits from common ancestor:
commit 0d0c80e26b5fe2c2bf78be329a441f6dffadf72a
Author: Rosemary Sebastian 
Date:   Wed Aug 30 21:47:22 2017 +0530

Preserve cursor behaviour for selection deletes

Change-Id: Ie3768a589b4c44230b30c559525710c6ca8efd4c

diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 0e9681af5b6d..d4f8202989f0 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -210,7 +210,7 @@ SwUndoDelete::SwUndoDelete(
 }
 
 // Move now also the PaM. The SPoint is at the beginning of a SSelection.
-if( pEnd == rPam.GetPoint() && ( !bFullPara || pSttTextNd || pEndTextNd ) )
+if( pEnd == rPam.GetPoint() && ( !bFullPara || pSttTextNd || pEndTextNd ) 
&& !m_bRedlineDelete )
 rPam.Exchange();
 
 if( !pSttTextNd && !pEndTextNd )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rosemary Sebastian]

Rebased ref, commits from common ancestor:
commit a40c8f138d5eb6218976c5440e6a8a2d3666ef78
Author: Rosemary Sebastian 
Date:   Wed Aug 30 21:47:22 2017 +0530

Preserve cursor behaviour for selection deletes

For more information, please have a look at the discussion here:
https://bugs.documentfoundation.org/show_bug.cgi?id=109272

Change-Id: Ie3768a589b4c44230b30c559525710c6ca8efd4c

diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 0e9681af5b6d..d4f8202989f0 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -210,7 +210,7 @@ SwUndoDelete::SwUndoDelete(
 }
 
 // Move now also the PaM. The SPoint is at the beginning of a SSelection.
-if( pEnd == rPam.GetPoint() && ( !bFullPara || pSttTextNd || pEndTextNd ) )
+if( pEnd == rPam.GetPoint() && ( !bFullPara || pSttTextNd || pEndTextNd ) 
&& !m_bRedlineDelete )
 rPam.Exchange();
 
 if( !pSttTextNd && !pEndTextNd )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rosemary Sebastian]

 sw/source/core/undo/undel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0bd48242a731a37eeb049d5d692153f5f522097f
Author: Rosemary Sebastian 
Date:   Wed Aug 30 21:47:22 2017 +0530

Preserve cursor behaviour for selection deletes

Change-Id: Ie3768a589b4c44230b30c559525710c6ca8efd4c

diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 0e9681af5b6d..d4f8202989f0 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -210,7 +210,7 @@ SwUndoDelete::SwUndoDelete(
 }
 
 // Move now also the PaM. The SPoint is at the beginning of a SSelection.
-if( pEnd == rPam.GetPoint() && ( !bFullPara || pSttTextNd || pEndTextNd ) )
+if( pEnd == rPam.GetPoint() && ( !bFullPara || pSttTextNd || pEndTextNd ) 
&& !m_bRedlineDelete )
 rPam.Exchange();
 
 if( !pSttTextNd && !pEndTextNd )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits