diff options
Diffstat (limited to 'sw/source/core/layout')
-rw-r--r-- | sw/source/core/layout/flycnt.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/ftnfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/layout/sectfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 11 |
5 files changed, 10 insertions, 11 deletions
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index df3527e5e661..8dceb15acff8 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -1062,7 +1062,7 @@ const SwContentFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, // With this we won't run into problems with the columns. Point aTmp( aNew ); const SwContentFrm *pTmp = pCnt->FindPageFrm()-> - GetContentPos( aTmp, false, true, false ); + GetContentPos( aTmp, false, true ); if ( pTmp && pTmp->Frm().IsInside( aNew ) ) return pTmp; } diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index bdb7bde18efb..ad334db9158f 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -208,7 +208,7 @@ void SwFootnoteContFrm::Format( vcl::RenderContext* /*pRenderContext*/, const Sw bGrow = false; } if( bGrow ) - Grow( LONG_MAX, false ); + Grow( LONG_MAX ); else { // VarSize is determined based on the content plus the borders diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index f51953ca30c4..31b5dae4fadf 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -4226,7 +4226,7 @@ void SwFlyFrm::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, Sw const SwBorderAttrs &rAttrs = *aAccess.Get(); SwRect aPaintRect( aRect ); aPaintRect._Intersection( pParentFlyFrm->Frm() ); - pParentFlyFrm->PaintBackground( aPaintRect, pPage, rAttrs, false, false ); + pParentFlyFrm->PaintBackground( aPaintRect, pPage, rAttrs ); gProp.pSRetoucheFly2 = pOldRet; } @@ -7650,7 +7650,7 @@ Graphic SwFlyFrameFormat::MakeGraphic( ImageMap* pMap ) gProp.pSGlobalShell = pSh; bool bNoteURL = pMap && - SfxItemState::SET != GetAttrSet().GetItemState( RES_URL, true ); + SfxItemState::SET != GetAttrSet().GetItemState( RES_URL ); if( bNoteURL ) { OSL_ENSURE( !pNoteURL, "MakeGraphic: pNoteURL already used? " ); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 4a24daafda89..dd82bac59dcc 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -1919,7 +1919,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst ) if( bInCalcContent ) _InvalidateSize(); else if( nSpace < nGrow && nDist != nSpace + GetUpper()-> - Grow( nGrow - nSpace, false ) ) + Grow( nGrow - nSpace ) ) InvalidateSize(); else { diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index d25f54331502..e23ab20cb17a 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -1745,7 +1745,7 @@ void SwTabFrm::MakeAll(vcl::RenderContext* pRenderContext) SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout(); if ( pLayout ) m_bCalcLowers = pLayout->Resize( - pLayout->GetBrowseWidthByTabFrm( *this ), false ); + pLayout->GetBrowseWidthByTabFrm( *this ) ); } // as long as bMakePage is true, a new page can be created (exactly once) @@ -1868,7 +1868,7 @@ void SwTabFrm::MakeAll(vcl::RenderContext* pRenderContext) { delete pAccess; m_bCalcLowers |= pLayout->Resize( - pLayout->GetBrowseWidthByTabFrm( *this ), false ); + pLayout->GetBrowseWidthByTabFrm( *this ) ); pAccess = new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); } @@ -1912,7 +1912,7 @@ void SwTabFrm::MakeAll(vcl::RenderContext* pRenderContext) { delete pAccess; m_bCalcLowers |= pLayout->Resize( - pLayout->GetBrowseWidthByTabFrm( *this ), false ); + pLayout->GetBrowseWidthByTabFrm( *this ) ); pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); } @@ -1961,8 +1961,7 @@ void SwTabFrm::MakeAll(vcl::RenderContext* pRenderContext) { delete pAccess; m_bCalcLowers |= pHTMLLayout->Resize( - pHTMLLayout->GetBrowseWidthByTabFrm( *this ), - false ); + pHTMLLayout->GetBrowseWidthByTabFrm( *this ) ); pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); @@ -3488,7 +3487,7 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) const SwPageDesc *pDesc = GetFormat()->GetPageDesc().GetPageDesc(); if ( (pDesc && pDesc != pPage->GetPageDesc()) || (!pDesc && pPage->GetPageDesc() != &GetFormat()->GetDoc()->GetPageDesc(0)) ) - CheckPageDescs( pPage, true ); + CheckPageDescs( pPage ); } } } |