[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/core/inc/txtfrm.hxx   |    2 +-
 sw/source/core/text/frmform.cxx |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6b88a6501a4de7aeb02da8f5efed28925aafc144
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jun 26 10:59:57 2015 +0200

    SwTextFrm::_Format: use vcl::RenderContext
    
    Change-Id: Ia37257286cce7a4a4a6fdffd2dd0d896d46db548

diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 0ca7591..1e5737d 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 c42f059..868580e 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1623,7 +1623,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();
 
@@ -1650,7 +1650,7 @@ void SwTextFrm::_Format( SwParaPortion *pPara )
     if ( IsVertical() )
         SwapWidthAndHeight();
 
-    SwTextFormatInfo aInf( getRootFrm()->GetCurrShell()->GetOut(), this );
+    SwTextFormatInfo aInf( pRenderContext, this );
     SwTextFormatter  aLine( this, &aInf );
 
     HideAndShowObjects();
@@ -1802,7 +1802,7 @@ void SwTextFrm::Format( const SwBorderAttrs * )
             }
             do
             {
-                _Format( aAccess.GetPara() );
+                _Format( getRootFrm()->GetCurrShell()->GetOut(), aAccess.GetPara() );
                 if( pFootnoteBoss && nFootnoteHeight )
                 {
                     const SwFootnoteContFrm* pCont = pFootnoteBoss->FindFootnoteCont();