Kaydet (Commit) d9f1249f authored tarafından Miklos Vajna's avatar Miklos Vajna Kaydeden (comit) Andras Timar

SwLayAction::InternalAction: use vcl::RenderContext

Change-Id: Icbc5e9a42cc7e7693c6584461505a3233046272c
(cherry picked from commit 1a2705d1)
üst 06e901de
...@@ -109,7 +109,7 @@ class SwLayAction ...@@ -109,7 +109,7 @@ class SwLayAction
bool TurboAction(); bool TurboAction();
bool _TurboAction( const SwContentFrm * ); bool _TurboAction( const SwContentFrm * );
void InternalAction(); void InternalAction(OutputDevice* pRenderContext);
static SwPageFrm *CheckFirstVisPage( SwPageFrm *pPage ); static SwPageFrm *CheckFirstVisPage( SwPageFrm *pPage );
......
...@@ -366,12 +366,12 @@ void SwLayAction::Action() ...@@ -366,12 +366,12 @@ void SwLayAction::Action()
if ( IsCalcLayout() ) if ( IsCalcLayout() )
SetCheckPages( false ); SetCheckPages( false );
InternalAction(); InternalAction(pImp->GetShell()->GetOut());
bAgain |= RemoveEmptyBrowserPages(); bAgain |= RemoveEmptyBrowserPages();
while ( IsAgain() ) while ( IsAgain() )
{ {
bAgain = bNextCycle = false; bAgain = bNextCycle = false;
InternalAction(); InternalAction(pImp->GetShell()->GetOut());
bAgain |= RemoveEmptyBrowserPages(); bAgain |= RemoveEmptyBrowserPages();
} }
pRoot->DeleteEmptySct(); pRoot->DeleteEmptySct();
...@@ -442,7 +442,7 @@ static void unlockPositionOfObjects( SwPageFrm *pPageFrm ) ...@@ -442,7 +442,7 @@ static void unlockPositionOfObjects( SwPageFrm *pPageFrm )
} }
} }
void SwLayAction::InternalAction() void SwLayAction::InternalAction(OutputDevice* pRenderContext)
{ {
OSL_ENSURE( pRoot->Lower()->IsPageFrm(), ":-( No page below the root."); OSL_ENSURE( pRoot->Lower()->IsPageFrm(), ":-( No page below the root.");
...@@ -454,7 +454,7 @@ void SwLayAction::InternalAction() ...@@ -454,7 +454,7 @@ void SwLayAction::InternalAction()
// number 1. If we're doing a fake formatting, the number of the first // number 1. If we're doing a fake formatting, the number of the first
// page is the number of the first visible page. // page is the number of the first visible page.
SwPageFrm *pPage = IsComplete() ? static_cast<SwPageFrm*>(pRoot->Lower()) : SwPageFrm *pPage = IsComplete() ? static_cast<SwPageFrm*>(pRoot->Lower()) :
pImp->GetFirstVisPage(pImp->GetShell()->GetOut()); pImp->GetFirstVisPage(pRenderContext);
if ( !pPage ) if ( !pPage )
pPage = static_cast<SwPageFrm*>(pRoot->Lower()); pPage = static_cast<SwPageFrm*>(pRoot->Lower());
...@@ -621,7 +621,7 @@ void SwLayAction::InternalAction() ...@@ -621,7 +621,7 @@ void SwLayAction::InternalAction()
if( !IsComplete() && nPreInvaPage + 2 < nFirstPageNum ) if( !IsComplete() && nPreInvaPage + 2 < nFirstPageNum )
{ {
pImp->SetFirstVisPageInvalid(); pImp->SetFirstVisPageInvalid();
SwPageFrm *pTmpPage = pImp->GetFirstVisPage(pImp->GetShell()->GetOut()); SwPageFrm *pTmpPage = pImp->GetFirstVisPage(pRenderContext);
nFirstPageNum = pTmpPage->GetPhyPageNum(); nFirstPageNum = pTmpPage->GetPhyPageNum();
if( nPreInvaPage < nFirstPageNum ) if( nPreInvaPage < nFirstPageNum )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment