sw/source/core/doc/DocumentRedlineManager.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 0b95e19d257d2afc1ec161c712e213aedfd6ccbe
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Aug 19 11:11:28 2016 +0200
sw: fix indentation in DocumentRedlineManager::AppendRedline()
Change-Id: I61cc418378ef6135c3da15cfa47b85fb422a7b34
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 99e9fcb..c879859 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1178,9 +1178,9 @@ bool DocumentRedlineManager::AppendRedline(
SwRangeRedline* pNewRedl, bool bCall
pRedl->IsOwnRedline( *pNewRedl ) )
{
- // Set to NONE, so that the Delete::Redo merges the Redline data
correctly!
- // The ShowMode needs to be retained!
- meRedlineMode = (RedlineMode_t)(eOld &
~(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE));
+ // Set to NONE, so that the Delete::Redo merges the
Redline data correctly!
+ // The ShowMode needs to be retained!
+ meRedlineMode = (RedlineMode_t)(eOld &
~(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE));
switch( eCmpPos )
{
case POS_EQUAL:
@@ -1192,7 +1192,7 @@ bool DocumentRedlineManager::AppendRedline(
SwRangeRedline* pNewRedl, bool bCall
case POS_INSIDE:
if( bCallDelete )
{
- meRedlineMode = (RedlineMode_t)(meRedlineMode |
nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES);
+ meRedlineMode = (RedlineMode_t)(meRedlineMode
| nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES);
// DeleteAndJoin does not yield the
// desired result if there is no paragraph to
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
