diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-29 09:14:05 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-29 09:37:50 +0200 |
commit | ea1ea3b910dea72c901cd655af9a3abd501f4e60 (patch) | |
tree | abb43a417dcf3db428e538b69dda776d89480d80 /sw/source/core/layout/calcmove.cxx | |
parent | 533e97947d82f780d5b1b7a02138d738b2435a56 (diff) |
SwFrm::PrepareMake: use vcl::RenderContext
Change-Id: I34306bb1622c79489eb647ed45f398ad2634c144
Diffstat (limited to 'sw/source/core/layout/calcmove.cxx')
-rw-r--r-- | sw/source/core/layout/calcmove.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index f08f956d9edd..7a29307d15ac 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; |