diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-10-14 02:51:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-15 06:49:23 +0000 |
| commit | b4b7703e4335460cf48bfd6440f116359994c8ff (patch) | |
| tree | 66b6ab43d6fb13d037160d7384d1a7a93d92940b /sw/source/core/layout | |
| parent | 90d82f73b89d8a0b0b13d224dbd1a741a10a7fd9 (diff) | |
cppcheck:variableScope
Change-Id: I9b671637fbe0f32e695d22b74bfb40a39a9fe884
Reviewed-on: https://gerrit.libreoffice.org/19364
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/core/layout')
| -rw-r--r-- | sw/source/core/layout/calcmove.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/layout/fly.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/frmtool.cxx | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 1ceaf5594a9d..78c96d14e590 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1093,7 +1093,6 @@ void SwContentFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/) // this flag is set. If it turns out that it // didn't keep it's promise, we can act in a // controlled fashion. - bool bMoveable; const bool bFly = IsInFly(); const bool bTab = IsInTab(); const bool bFootnote = IsInFootnote(); @@ -1197,6 +1196,8 @@ void SwContentFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/) SWRECTFN( this ) + bool bMoveable; + while ( !mbValidPos || !mbValidSize || !mbValidPrtArea ) { // - loop prevention diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 87c275d7fed4..2d854d6f1917 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -1496,10 +1496,10 @@ void CalcContent( SwLayoutFrm *pLay, pTmpPrevFlowFrm->IsKeepFwdMoveAllowed(); // format floating screen objects anchored to the frame. - bool bRestartLayoutProcess = false; if ( !bPrevInvalid && pFrm->GetDrawObjs() && pLay->IsAnLower( pFrm ) ) { bool bAgain = false; + bool bRestartLayoutProcess = false; SwPageFrm* pPageFrm = pFrm->FindPageFrm(); size_t nCnt = pFrm->GetDrawObjs()->size(); size_t i = 0; diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index bf38170751c8..073cdf67121e 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1248,8 +1248,6 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, SwPageFrm *pPage = pLay->FindPageFrm(); const SwFrameFormats *pTable = pDoc->GetSpzFrameFormats(); SwFrm *pFrm = 0; - bool bBreakAfter = false; - SwActualSection *pActualSection = 0; SwLayHelper *pPageMaker; @@ -1260,6 +1258,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, { // Attention: the SwLayHelper class uses references to the content-, // page-, layout-frame etc. and may change them! + bool bBreakAfter = false; pPageMaker = new SwLayHelper( pDoc, pFrm, pPrv, pPage, pLay, pActualSection, bBreakAfter, nIndex, 0 == nEndIndex ); if( bStartPercent ) |