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

SwTextFrm::_Format: use vcl::RenderContext

Change-Id: Ia37257286cce7a4a4a6fdffd2dd0d896d46db548
(cherry picked from commit 6b88a650)
üst b6ab7439
...@@ -142,7 +142,7 @@ class SwTextFrm: public SwContentFrm ...@@ -142,7 +142,7 @@ class SwTextFrm: public SwContentFrm
// In order to safe stack space, we split this method: // In order to safe stack space, we split this method:
// _Format calls _Format with parameters // _Format calls _Format with parameters
void _Format( SwParaPortion *pPara ); void _Format( vcl::RenderContext* pRenderContext, SwParaPortion *pPara );
void _Format( SwTextFormatter &rLine, SwTextFormatInfo &rInf, void _Format( SwTextFormatter &rLine, SwTextFormatInfo &rInf,
const bool bAdjust = false ); const bool bAdjust = false );
void FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf ); void FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf );
......
...@@ -1638,7 +1638,7 @@ void SwTextFrm::FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf ) ...@@ -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(); const bool bIsEmpty = GetText().isEmpty();
...@@ -1665,7 +1665,7 @@ void SwTextFrm::_Format( SwParaPortion *pPara ) ...@@ -1665,7 +1665,7 @@ void SwTextFrm::_Format( SwParaPortion *pPara )
if ( IsVertical() ) if ( IsVertical() )
SwapWidthAndHeight(); SwapWidthAndHeight();
SwTextFormatInfo aInf( getRootFrm()->GetCurrShell()->GetOut(), this ); SwTextFormatInfo aInf( pRenderContext, this );
SwTextFormatter aLine( this, &aInf ); SwTextFormatter aLine( this, &aInf );
HideAndShowObjects(); HideAndShowObjects();
...@@ -1817,7 +1817,7 @@ void SwTextFrm::Format( const SwBorderAttrs * ) ...@@ -1817,7 +1817,7 @@ void SwTextFrm::Format( const SwBorderAttrs * )
} }
do do
{ {
_Format( aAccess.GetPara() ); _Format( getRootFrm()->GetCurrShell()->GetOut(), aAccess.GetPara() );
if( pFootnoteBoss && nFootnoteHeight ) if( pFootnoteBoss && nFootnoteHeight )
{ {
const SwFootnoteContFrm* pCont = pFootnoteBoss->FindFootnoteCont(); const SwFootnoteContFrm* pCont = pFootnoteBoss->FindFootnoteCont();
......
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