diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-05-09 20:59:53 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-05-09 22:28:44 +0200 |
| commit | 261b1ad80aae0dd9aba50190a4cf99011cc18fb9 (patch) | |
| tree | f37e5e85296e64957d743671a2675b1909f1b173 /sc | |
| parent | dd484af7cfb472a39c9afebc6dad9ea28d1224c4 (diff) | |
'!= false' is redundant, and confusing - kill it.
Change-Id: I1a52b9ce7b590e8cf274a2daaa1c55cfc1efe48b
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/address.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/chgtrack.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 825daaeaf772..d1ea155f723e 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -615,7 +615,7 @@ static const sal_Unicode* lcl_r1c1_get_col( const sal_Unicode* p, return NULL; p++; - if( (isRelative = (*p == '[') ) != false ) + if( isRelative = (*p == '[') ) p++; n = sal_Unicode_strtol( p, &pEnd ); if( NULL == pEnd ) @@ -661,7 +661,7 @@ static inline const sal_Unicode* lcl_r1c1_get_row( return NULL; p++; - if( (isRelative = (*p == '[') ) != false ) + if( isRelative = (*p == '[') ) p++; n = sal_Unicode_strtol( p, &pEnd ); if( NULL == pEnd ) diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index fe280e31177a..f6def98c04f3 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -1018,12 +1018,12 @@ bool ScChangeActionDel::Reject( ScDocument* pDoc ) case SC_CAT_DELETE_COLS : if ( !(aRange.aStart.Col() == 0 && aRange.aEnd.Col() == MAXCOL) ) { // Only if not TabDelete - if ( ( bOk = pDoc->CanInsertCol( aRange ) ) != false ) + if ( bOk = pDoc->CanInsertCol( aRange ) ) bOk = pDoc->InsertCol( aRange ); } break; case SC_CAT_DELETE_ROWS : - if ( ( bOk = pDoc->CanInsertRow( aRange ) ) != false ) + if ( bOk = pDoc->CanInsertRow( aRange ) ) bOk = pDoc->InsertRow( aRange ); break; case SC_CAT_DELETE_TABS : @@ -1031,7 +1031,7 @@ bool ScChangeActionDel::Reject( ScDocument* pDoc ) //TODO: Remember table names? OUString aName; pDoc->CreateValidTabName( aName ); - if ( ( bOk = pDoc->ValidNewTabName( aName ) ) != false ) + if ( bOk = pDoc->ValidNewTabName( aName ) ) bOk = pDoc->InsertTab( aRange.aStart.Tab(), aName ); } break; @@ -4224,7 +4224,7 @@ bool ScChangeTrack::Reject( bOk = Reject( itChangeAction->second, NULL, true ); //! Recursion } } - if ( bOk && (bRejected = pAct->Reject( pDoc )) != false ) + if ( bOk && (bRejected = pAct->Reject( pDoc )) ) { // pRefDoc NULL := Do not save deleted Cells AppendDeleteRange( pAct->GetBigRange().MakeRange(), NULL, (short) 0, @@ -4337,7 +4337,7 @@ bool ScChangeTrack::Reject( bOk = Reject( itChangeAction->second, NULL, true );//! Recursion } } - if ( bOk && (bRejected = pAct->Reject( pDoc )) != false ) + if ( bOk && (bRejected = pAct->Reject( pDoc )) ) { ScChangeActionMove* pReject = new ScChangeActionMove( pAct->GetBigRange().MakeRange(), @@ -4361,7 +4361,7 @@ bool ScChangeTrack::Reject( aCell.assign(*pDoc, aRange.aStart); pReject->SetOldValue(aCell, pDoc, pDoc); } - if ( (bRejected = pAct->Reject( pDoc )) != false && !bRecursion ) + if ( (bRejected = pAct->Reject( pDoc )) && !bRecursion ) { ScCellValue aCell; aCell.assign(*pDoc, aRange.aStart); |