summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-06-25 12:27:54 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-06-25 14:15:00 +0200
commit1a2705d16c945cdd85dd75c803039c05af0c853c (patch)
treea111a1cdaa4af7abdb2fce0476acb3c930037c1d /sw
parentc369f8644c45869cb1d80e5e243e445f5cb8b778 (diff)
SwLayAction::InternalAction: use vcl::RenderContext
Change-Id: Icbc5e9a42cc7e7693c6584461505a3233046272c
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/inc/layact.hxx2
-rw-r--r--sw/source/core/layout/layact.cxx10
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 697762729625..e85ff3609bba 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -109,7 +109,7 @@ class SwLayAction
bool TurboAction();
bool _TurboAction( const SwContentFrm * );
- void InternalAction();
+ void InternalAction(OutputDevice* pRenderContext);
static SwPageFrm *CheckFirstVisPage( SwPageFrm *pPage );
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 737c4ece8cd2..f140b7152f47 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -366,12 +366,12 @@ void SwLayAction::Action()
if ( IsCalcLayout() )
SetCheckPages( false );
- InternalAction();
+ InternalAction(pImp->GetShell()->GetOut());
bAgain |= RemoveEmptyBrowserPages();
while ( IsAgain() )
{
bAgain = bNextCycle = false;
- InternalAction();
+ InternalAction(pImp->GetShell()->GetOut());
bAgain |= RemoveEmptyBrowserPages();
}
pRoot->DeleteEmptySct();
@@ -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.");
@@ -454,7 +454,7 @@ void SwLayAction::InternalAction()
// number 1. If we're doing a fake formatting, the number of the first
// page is the number of the first visible page.
SwPageFrm *pPage = IsComplete() ? static_cast<SwPageFrm*>(pRoot->Lower()) :
- pImp->GetFirstVisPage(pImp->GetShell()->GetOut());
+ pImp->GetFirstVisPage(pRenderContext);
if ( !pPage )
pPage = static_cast<SwPageFrm*>(pRoot->Lower());
@@ -621,7 +621,7 @@ void SwLayAction::InternalAction()
if( !IsComplete() && nPreInvaPage + 2 < nFirstPageNum )
{
pImp->SetFirstVisPageInvalid();
- SwPageFrm *pTmpPage = pImp->GetFirstVisPage(pImp->GetShell()->GetOut());
+ SwPageFrm *pTmpPage = pImp->GetFirstVisPage(pRenderContext);
nFirstPageNum = pTmpPage->GetPhyPageNum();
if( nPreInvaPage < nFirstPageNum )
{