diff options
Diffstat (limited to 'sw/source/core/layout')
-rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/layout/findfrm.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/ftnfrm.cxx | 19 | ||||
-rw-r--r-- | sw/source/core/layout/hffrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/layouter.cxx | 3 | ||||
-rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 9 | ||||
-rw-r--r-- | sw/source/core/layout/sectfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/trvlfrm.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/layout/virtoutp.cxx | 10 |
11 files changed, 38 insertions, 31 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 8e087c038b28..c944fb2178a1 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -157,7 +157,7 @@ static void lcl_DelHFFormat( SwClient *pToRemove, SwFrameFormat *pFormat ) if( pShell ) { pShell->ParkCursor( aIdx ); - aIdx = nEnd-1; + aIdx = nEnd-1; } } ++aIdx; @@ -2375,7 +2375,7 @@ bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case MID_GRID_STANDARD_MODE: { bool bStandard = *o3tl::doAccess<bool>(rVal); - SetSquaredMode( !bStandard ); + SetSquaredMode( !bStandard ); break; } default: diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 2f6c2b495dc5..3ed0dede61f5 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -341,11 +341,11 @@ const SwLayoutFrame *SwFrame::ImplGetNextLayoutLeaf( bool bFwd ) const } } - // If I could not go down or forward, I'll have to go up - bGoingUp = !bGoingFwdOrBwd && !bGoingDown; + // If I could not go down or forward, I'll have to go up + bGoingUp = !bGoingFwdOrBwd && !bGoingDown; - pFrame = p; - p = lcl_GetLower( pFrame, true ); + pFrame = p; + p = lcl_GetLower( pFrame, true ); } while( ( p && !p->IsFlowFrame() ) || pFrame == this || diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 0042265acc2b..39d369d1b38b 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -739,7 +739,7 @@ SwTabFrame* SwTabFrame::FindMaster( bool bFirstMaster ) const return pTab; } - pTab = aIter.Next(); + pTab = aIter.Next(); } OSL_FAIL( "Follow is lost in Space." ); diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 2bbbab22b2a5..7f5ac35034ef 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -572,7 +572,8 @@ void SwFootnoteFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) // If the predecessor is the master and/or the successor is the Follow, // then take their content and destroy them. if ( GetPrev() && GetPrev() == GetMaster() ) - { OSL_ENSURE( SwFlowFrame::CastFlowFrame( GetPrev()->GetLower() ), + { + OSL_ENSURE( SwFlowFrame::CastFlowFrame( GetPrev()->GetLower() ), "Footnote without content?" ); SwFlowFrame::CastFlowFrame( GetPrev()->GetLower())-> MoveSubTree( this, GetLower() ); @@ -581,7 +582,8 @@ void SwFootnoteFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) SwFrame::DestroyFrame(pDel); } if ( GetNext() && GetNext() == GetFollow() ) - { OSL_ENSURE( SwFlowFrame::CastFlowFrame( GetNext()->GetLower() ), + { + OSL_ENSURE( SwFlowFrame::CastFlowFrame( GetNext()->GetLower() ), "Footnote without content?" ); SwFlowFrame::CastFlowFrame( GetNext()->GetLower() )->MoveSubTree( this ); SwFrame *pDel = GetNext(); @@ -1130,8 +1132,8 @@ void SwFootnoteBossFrame::ResetFootnote( const SwFootnoteFrame *pCheck ) SwFrame* pFrame = aIter.First(); while( pFrame ) { - if( pFrame->getRootFrame() == pCheck->getRootFrame() ) - { + if( pFrame->getRootFrame() == pCheck->getRootFrame() ) + { SwFrame *pTmp = pFrame->GetUpper(); while ( pTmp && !pTmp->IsFootnoteFrame() ) pTmp = pTmp->GetUpper(); @@ -1255,7 +1257,8 @@ void SwFootnoteBossFrame::InsertFootnote( SwFootnoteFrame* pNew ) // index is after the index of the newly inserted, to place the new one correctly pSibling = static_cast<SwFootnoteFrame*>(pParent->Lower()); if ( !pSibling ) - { OSL_ENSURE( false, "Could not find space for footnote."); + { + OSL_ENSURE( false, "Could not find space for footnote."); return; } nCmpPos = ::lcl_FindFootnotePos( pDoc, pSibling->GetAttr() ); @@ -1832,7 +1835,8 @@ void SwFootnoteBossFrame::CollectFootnotes_( const SwContentFrame* _pRef, } while( !pNxtFootnote && pBoss ); } else if( !pNxtFootnote->GetAttr()->GetFootnote().IsEndNote() ) - { OSL_ENSURE( !pNxtFootnote->GetMaster(), "_CollectFootnote: Master expected" ); + { + OSL_ENSURE( !pNxtFootnote->GetMaster(), "_CollectFootnote: Master expected" ); while ( pNxtFootnote->GetMaster() ) pNxtFootnote = pNxtFootnote->GetMaster(); } @@ -2045,7 +2049,8 @@ void SwFootnoteBossFrame::MoveFootnotes_( SwFootnoteFrames &rFootnoteArr, bool b } } else - { OSL_ENSURE( !pFootnote->GetMaster() && !pFootnote->GetFollow(), + { + OSL_ENSURE( !pFootnote->GetMaster() && !pFootnote->GetFollow(), "DelFootnote and Master/Follow?" ); SwFrame::DestroyFrame(pFootnote); // #i21478# diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 4d0c56241183..7c44bc31b57d 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -269,7 +269,7 @@ void SwHeadFootFrame::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) static_cast<SwTextFrame*>(pFrame)->IsJoinLocked(), "<SwHeadFootFrame::FormatSize(..)> - text frame invalid and not locked." ); - if ( pFrame->IsTextFrame() && pFrame->isFrameAreaDefinitionValid() ) + if ( pFrame->IsTextFrame() && pFrame->isFrameAreaDefinitionValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrame( *pFrame, *(pFrame->FindPageFrame()) ) ) diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index 27acb33779cb..dbb5757bbd1b 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -91,7 +91,8 @@ void SwEndnoter::CollectEndnote( SwFootnoteFrame* pFootnote ) } while ( pCnt ); } else - { OSL_ENSURE( pNxt->Lower() && pNxt->Lower()->IsSctFrame(), + { + OSL_ENSURE( pNxt->Lower() && pNxt->Lower()->IsSctFrame(), "Endnote without content?" ); pNxt->Cut(); SwFrame::DestroyFrame(pNxt); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 213ce01e7797..b3fc9e8843b3 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3340,9 +3340,10 @@ void SwLayoutFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect cons if ( pFrame->IsRetouche() ) { if ( pFrame->IsRetoucheFrame() && bWin && !pFrame->GetNext() ) - { if ( !pPage ) + { + if ( !pPage ) pPage = FindPageFrame(); - pFrame->Retouch( pPage, rRect ); + pFrame->Retouch( pPage, rRect ); } pFrame->ResetRetouche(); } @@ -6281,7 +6282,7 @@ void SwFrame::PaintSwFrameBackground( const SwRect &rRect, const SwPageFrame *pP // background transparency have to be considered // Set missing 5th parameter to the default value GRFNUM_NO // - see declaration in /core/inc/frmtool.hxx. - ::DrawGraphic( + ::DrawGraphic( pItem, pOut, aOrigBackRect, @@ -7387,7 +7388,7 @@ Graphic SwFlyFrameFormat::MakeGraphic( ImageMap* pMap ) ::SetOutDevAndWin( pSh, pOld, pWin, nZoom ); // #i92711# end Pre/PostPaint encapsulation when pOut is back and content is painted - pSh->DLPostPaint2(true); + pSh->DLPostPaint2(true); aMet.Stop(); aMet.Move( -pFly->getFrameArea().Left(), -pFly->getFrameArea().Top() ); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 6cd503bce7e7..39bf62082c18 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -962,7 +962,7 @@ static SwFootnoteFrame* lcl_FindEndnote( SwSectionFrame* &rpSect, bool &rbEmpty, SwSectionFrame* pSect = rbEmpty ? rpSect->GetFollow() : rpSect; while( pSect ) { - OSL_ENSURE( (pSect->Lower() && pSect->Lower()->IsColumnFrame()) || pSect->GetUpper()->IsFootnoteFrame(), + OSL_ENSURE( (pSect->Lower() && pSect->Lower()->IsColumnFrame()) || pSect->GetUpper()->IsFootnoteFrame(), "InsertEndnotes: Where's my column?" ); // i73332: Columned section in endnote diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 3d0a64b4c92d..b662513534e3 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -3785,7 +3785,7 @@ long CalcHeightWithFlys( const SwFrame *pFrame ) if ( pMaster ) { - pObjs = static_cast<const SwTextFrame*>(pTmp)->FindMaster()->GetDrawObjs(); + pObjs = static_cast<const SwTextFrame*>(pTmp)->FindMaster()->GetDrawObjs(); bIsFollow = true; } } diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index fc7efacafae9..bc1951343c73 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -782,7 +782,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart, nX = nPrtLeft; else { - const long nPrtRight = bRTL ? + const long nPrtRight = bRTL ? aRectFnSet.GetPrtLeft(*pTable) : aRectFnSet.GetPrtRight(*pTable); if ( bRTL != (nX > nPrtRight) ) @@ -866,7 +866,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart, //The flow leads from one table to the next. The X-value //needs to be corrected by the amount of the offset of //the tables - if ( pTable && + if ( pTable && !pTab->GetUpper()->IsInTab() && !pTable->GetUpper()->IsInTab() ) nX += pTab->getFrameArea().Left() - pTable->getFrameArea().Left(); @@ -2581,8 +2581,8 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor) else { SwNodeIndex idx( nodes.GetEndOfContent()); - if( SwContentNode* last = SwNodes::GoPrevious( &idx )) - inSelection = *pEndPos == SwPosition( *last, last->Len()); + if( SwContentNode* last = SwNodes::GoPrevious( &idx )) + inSelection = *pEndPos == SwPosition( *last, last->Len()); } } if( inSelection ) diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx index 389a2154cd24..ccc7f6744776 100644 --- a/sw/source/core/layout/virtoutp.cxx +++ b/sw/source/core/layout/virtoutp.cxx @@ -120,11 +120,11 @@ void SwLayVout::Enter( SwViewShell *pShell, SwRect &rRect, bool bOn ) Flush(); #ifdef DBG_UTIL - if( pShell->GetViewOptions()->IsTest3() ) - { - ++nCount; - return; - } + if( pShell->GetViewOptions()->IsTest3() ) + { + ++nCount; + return; + } #endif bOn = bOn && !nCount && rRect.HasArea() && pShell->GetWin(); |