sw/source/core/inc/frame.hxx | 7 +------ sw/source/core/layout/calcmove.cxx | 10 +++++----- sw/source/core/layout/fly.cxx | 2 +- sw/source/core/layout/trvlfrm.cxx | 6 ++++++ 4 files changed, 13 insertions(+), 12 deletions(-)
New commits: commit ea1ea3b910dea72c901cd655af9a3abd501f4e60 Author: Miklos Vajna <[email protected]> Date: Mon Jun 29 09:14:05 2015 +0200 SwFrm::PrepareMake: use vcl::RenderContext Change-Id: I34306bb1622c79489eb647ed45f398ad2634c144 diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index f971809..834b042 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -370,7 +370,7 @@ protected: void setRootFrm( SwRootFrm* pRoot ) { mpRoot = pRoot; } SwPageFrm *InsertPage( SwPageFrm *pSibling, bool bFootnote ); - void PrepareMake(); + void PrepareMake(vcl::RenderContext* pRenderContext); void OptPrepareMake(); void MakePos(); // Format next frame of table frame to assure keeping attributes. diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index f08f956..7a29307 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -238,7 +238,7 @@ static bool lcl_IsCalcUpperAllowed( const SwFrm& rFrm ) * * @see MakeAll() */ -void SwFrm::PrepareMake() +void SwFrm::PrepareMake(vcl::RenderContext* pRenderContext) { StackHack aHack; if ( GetUpper() ) @@ -274,7 +274,7 @@ void SwFrm::PrepareMake() const SwTextFrm* pMaster = static_cast<SwContentFrm*>(this)->FindMaster(); if ( pMaster && pMaster->IsLocked() ) { - MakeAll(IsRootFrm() ? 0 : getRootFrm()->GetCurrShell()->GetOut()); + MakeAll(pRenderContext); return; } } @@ -303,7 +303,7 @@ void SwFrm::PrepareMake() (SwFlowFrm::CastFlowFrm(pFrm))->IsAnFollow( pThis ) ) break; - pFrm->MakeAll(IsRootFrm() ? 0 : getRootFrm()->GetCurrShell()->GetOut()); + pFrm->MakeAll(pRenderContext); if( IsSctFrm() && !static_cast<SwSectionFrm*>(this)->GetSection() ) break; } @@ -337,7 +337,7 @@ void SwFrm::PrepareMake() if ( bTab && !bOldTabLock ) ::PrepareUnlock( static_cast<SwTabFrm*>(this) ); } - MakeAll(IsRootFrm() ? 0 : getRootFrm()->GetCurrShell()->GetOut()); + MakeAll(pRenderContext); } void SwFrm::OptPrepareMake() @@ -354,7 +354,7 @@ void SwFrm::OptPrepareMake() return; } if ( GetPrev() && !GetPrev()->IsValid() ) - PrepareMake(); + PrepareMake(getRootFrm()->GetCurrShell() ? getRootFrm()->GetCurrShell()->GetOut() : 0); else { StackHack aHack; diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 2337950..b28041c 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -2657,7 +2657,7 @@ SwFlyFrameFormat * SwFlyFrm::GetFormat() void SwFlyFrm::Calc() const { if ( !m_bValidContentPos ) - const_cast<SwFlyFrm*>(this)->PrepareMake(); + const_cast<SwFlyFrm*>(this)->PrepareMake(getRootFrm()->GetCurrShell() ? getRootFrm()->GetCurrShell()->GetOut() : 0); else SwLayoutFrm::Calc(); } diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 7a124c5..552a171 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -1789,7 +1789,7 @@ bool SwFrm::OnFirstPage() const void SwFrm::Calc() const { if ( !mbValidPos || !mbValidPrtArea || !mbValidSize ) - const_cast<SwFrm*>(this)->PrepareMake(); + const_cast<SwFrm*>(this)->PrepareMake(getRootFrm()->GetCurrShell() ? getRootFrm()->GetCurrShell()->GetOut() : 0); } Point SwFrm::GetRelPos() const commit 533e97947d82f780d5b1b7a02138d738b2435a56 Author: Miklos Vajna <[email protected]> Date: Mon Jun 29 09:13:36 2015 +0200 sw: outline SwFrm::Calc() Change-Id: I9c59116828585c9645bc415ef5fffe65a24d09ee diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 9677a5f..f971809 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -998,11 +998,6 @@ inline void SwFrm::InvalidateNextPos( bool bNoFootnote ) ImplInvalidateNextPos( bNoFootnote ); } -inline void SwFrm::Calc() const -{ - if ( !mbValidPos || !mbValidPrtArea || !mbValidSize ) - const_cast<SwFrm*>(this)->PrepareMake(); -} inline void SwFrm::OptCalc() const { if ( !mbValidPos || !mbValidPrtArea || !mbValidSize ) diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 20fbfa9..7a124c5 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -1786,6 +1786,12 @@ bool SwFrm::OnFirstPage() const return bRet; } +void SwFrm::Calc() const +{ + if ( !mbValidPos || !mbValidPrtArea || !mbValidSize ) + const_cast<SwFrm*>(this)->PrepareMake(); +} + Point SwFrm::GetRelPos() const { Point aRet( maFrm.Pos() ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
