diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2013-11-12 09:41:16 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2013-11-12 13:39:46 +0100 |
| commit | 0385e736523b52087d96587f399fb3e61f911766 (patch) | |
| tree | bd2350ce24d37d56caeb31945c3439ff73cf14aa | |
| parent | reorient ok/cancel buttons to normal positions (diff) | |
| download | core-0385e736523b52087d96587f399fb3e61f911766.tar.gz core-0385e736523b52087d96587f399fb3e61f911766.zip | |
Less confusing variable name.
Change-Id: I8a6c9a037b3863d913583f5be3d7c0c6b96f29f8
| -rw-r--r-- | sw/source/core/doc/docredln.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 2620ce82f7e6..d67e9b50b816 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -287,7 +287,7 @@ Behaviour of Delete-Redline: */ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) { - bool bError = true; + bool bMerged = false; _CHECK_REDLINE( this ) if( IsRedlineOn() && !IsShowOriginal( meRedlineMode ) && @@ -404,7 +404,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) mpRedlineTbl->Insert( pRedl ); } - bError = false; + bMerged = true; bDelete = true; } else if( (( POS_BEFORE == eCmpPos && @@ -420,7 +420,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) mpRedlineTbl->Remove( n ); mpRedlineTbl->Insert( pRedl ); - bError = false; + bMerged = true; bDelete = true; } else if ( POS_OUTSIDE == eCmpPos ) @@ -1227,7 +1227,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) } _CHECK_REDLINE( this ) - return ( 0 != pNewRedl ) || !bError; + return ( 0 != pNewRedl ) || bMerged; } void SwDoc::CompressRedlines() |