diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-26 10:59:57 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-29 09:05:04 +0200 |
| commit | b948535998791317c96df98fa18271280f9893c2 (patch) | |
| tree | 51b3bd157907a3473669403122f54008fda7bcf0 /sw | |
| parent | bf985aa384e053bc829de4d2ff56ba22049297a8 (diff) | |
SwTextFrm::_Format: use vcl::RenderContext
Change-Id: Ia37257286cce7a4a4a6fdffd2dd0d896d46db548
(cherry picked from commit 6b88a6501a4de7aeb02da8f5efed28925aafc144)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/inc/txtfrm.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/frmform.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 6fe93808c503..28cb0ba80f9a 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -142,7 +142,7 @@ class SwTextFrm: public SwContentFrm // In order to safe stack space, we split this method: // _Format calls _Format with parameters - void _Format( SwParaPortion *pPara ); + void _Format( vcl::RenderContext* pRenderContext, SwParaPortion *pPara ); void _Format( SwTextFormatter &rLine, SwTextFormatInfo &rInf, const bool bAdjust = false ); void FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf ); diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 3f91eada0265..be1b99775bf4 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -1638,7 +1638,7 @@ void SwTextFrm::FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf ) } } -void SwTextFrm::_Format( SwParaPortion *pPara ) +void SwTextFrm::_Format( vcl::RenderContext* pRenderContext, SwParaPortion *pPara ) { const bool bIsEmpty = GetText().isEmpty(); @@ -1665,7 +1665,7 @@ void SwTextFrm::_Format( SwParaPortion *pPara ) if ( IsVertical() ) SwapWidthAndHeight(); - SwTextFormatInfo aInf( getRootFrm()->GetCurrShell()->GetOut(), this ); + SwTextFormatInfo aInf( pRenderContext, this ); SwTextFormatter aLine( this, &aInf ); HideAndShowObjects(); @@ -1817,7 +1817,7 @@ void SwTextFrm::Format( const SwBorderAttrs * ) } do { - _Format( aAccess.GetPara() ); + _Format( getRootFrm()->GetCurrShell()->GetOut(), aAccess.GetPara() ); if( pFootnoteBoss && nFootnoteHeight ) { const SwFootnoteContFrm* pCont = pFootnoteBoss->FindFootnoteCont(); |