summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-08-19 11:11:28 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-08-19 17:02:28 +0200
commitfc4340ba565d1aa7e008d78d5c07c1d424928abc (patch)
treefca099633f7e1c9282ccfb1c7fb329e888897014
parent2fa72bab4452a629fe6912d8278c5959cecfb454 (diff)
sw: fix indentation in DocumentRedlineManager::AppendRedline()
Change-Id: I61cc418378ef6135c3da15cfa47b85fb422a7b34 (cherry picked from commit 0b95e19d257d2afc1ec161c712e213aedfd6ccbe)
-rw-r--r--sw/source/core/doc/DocumentRedlineManager.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index c8802930f371..34fe092cf226 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