diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-26 11:46:05 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-26 13:40:26 +0200 |
| commit | 05e50b570f602c17218bb6e82bcaac2fbdd943c1 (patch) | |
| tree | 3cab9d1b08c4d8fd899622be9fc3857bac4842ae /sw/source/core/layout/calcmove.cxx | |
| parent | 6b88a6501a4de7aeb02da8f5efed28925aafc144 (diff) | |
SwTextFrm::Format: use vcl::RenderContext
Change-Id: I468d662a612c951dc1482cfc685dee800bb11f82
Diffstat (limited to 'sw/source/core/layout/calcmove.cxx')
| -rw-r--r-- | sw/source/core/layout/calcmove.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index e52cfd0d0447..280598cdcf80 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -765,7 +765,7 @@ void SwPageFrm::MakeAll() { // Set FixSize. For pages, this is not done from Upper, but from // the attribute. Frm().SSize( pAttrs->GetSize() ); - Format( pAttrs ); + Format( getRootFrm()->GetCurrShell()->GetOut(), pAttrs ); } } } @@ -850,7 +850,7 @@ void SwLayoutFrm::MakeAll() pAccess = new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); } - Format( pAttrs ); + Format( getRootFrm()->GetCurrShell()->GetOut(), pAttrs ); } } //while ( !mbValidPos || !mbValidSize || !mbValidPrtArea ) delete pAccess; @@ -1334,7 +1334,7 @@ void SwContentFrm::MakeAll() // without change occur. if ( nConsecutiveFormatsWithoutChange <= cnStopFormat ) { - Format(); + Format(getRootFrm()->GetCurrShell()->GetOut()); } #if OSL_DEBUG_LEVEL > 0 else @@ -1386,7 +1386,7 @@ void SwContentFrm::MakeAll() Prepare( PREP_WIDOWS_ORPHANS, 0, false ); mbValidSize = true; bFormatted = sal_True; - Format(); + Format(getRootFrm()->GetCurrShell()->GetOut()); } } SwFrm *pNxt = HasFollow() ? NULL : FindNext(); @@ -1716,7 +1716,7 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ) pNxt->Frm().Width( pNxt->GetUpper()->Prt().Width() ); } static_cast<SwContentFrm*>(pNxt)->MakePrtArea( rAttrs ); - pNxt->Format( &rAttrs ); + pNxt->Format( pNxt->getRootFrm()->GetCurrShell()->GetOut(), &rAttrs ); } else { @@ -1730,7 +1730,7 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ) else pNxt->Frm().Width( pNxt->GetUpper()->Prt().Width() ); } - pNxt->Format( &rAttrs ); + pNxt->Format( pNxt->getRootFrm()->GetCurrShell()->GetOut(), &rAttrs ); } pFrm->mbValidPos = bOldPos; |