diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2012-12-20 00:25:25 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2012-12-20 00:25:25 +0100 |
| commit | f3ea8bb8f69db2398a3858de0dc9c3b0d8cc9774 (patch) | |
| tree | 251f545574478490709259d450bdc801c9c5037f | |
| parent | d507c57a86cde92428aaa029053b27154373a4f3 (diff) | |
Some cppcheck cleaning
Change-Id: I04a7a1b119cb6cca4bf0dd0d576e5e051f99cc6f
| -rw-r--r-- | sw/source/core/doc/tblafmt.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index ea1630c14cf8..976273306639 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -912,10 +912,9 @@ void SwTableAutoFmt::StoreTableProperties(const SwTable &table) sal_Bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions ) { - sal_Bool bRet = sal_True; sal_uInt16 nVal = 0; rStream >> nVal; - bRet = 0 == rStream.GetError(); + sal_Bool bRet = 0 == rStream.GetError(); if( bRet && (nVal == AUTOFORMAT_DATA_ID_X || (AUTOFORMAT_DATA_ID_504 <= nVal && nVal <= AUTOFORMAT_DATA_ID)) ) diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 8e6c686812c4..188a7607659b 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -1983,7 +1983,6 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b // If our NewUpper lies in a SectionFrm, we need to make sure // that it won't destroy itself in Calc. SwSectionFrm* pSect = pNewUpper->FindSctFrm(); - bool bUnlock = false; if( pSect ) { // If we only switch column within our SectionFrm, we better don't @@ -1991,7 +1990,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b // call us again, etc. if( pSect != rThis.FindSctFrm() ) { - bUnlock = !pSect->IsColLocked(); + bool bUnlock = !pSect->IsColLocked(); pSect->ColLock(); pNewUpper->Calc(); if( bUnlock ) |