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

[Miklos Vajna]

 sw/source/core/layout/paintfrm.cxx |    4 +---
 sw/source/core/text/frmpaint.cxx   |    6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit f640893b8ca6dc8f390dc128ad252693c7d241d9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jun 24 13:13:41 2015 +0200

    SwLayoutFrm::Paint: use vcl::RenderContext
    
    Change-Id: Ibc36078313a9ee2482e392de18abfe77f3d0df48

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index e81a7cb..48c3f63 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3588,11 +3588,9 @@ SwShortCut::SwShortCut( const SwFrm& rFrm, const SwRect& rRect )
 
 void SwLayoutFrm::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const
 {
-    SwViewShell *pSh = getRootFrm()->GetCurrShell();
-
     // #i16816# tagged pdf support
     Frm_Info aFrmInfo( *this );
-    SwTaggedPDFHelper aTaggedPDFHelper( 0, &aFrmInfo, 0, *pSh->GetOut() );
+    SwTaggedPDFHelper aTaggedPDFHelper( 0, &aFrmInfo, 0, rRenderContext );
 
     const SwFrm *pFrm = Lower();
     if ( !pFrm )
commit c4270080798881bdac8392814dfb530e6a974c1e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jun 24 13:12:08 2015 +0200

    SwTextFrm::Paint: use vcl::RenderContext
    
    Change-Id: Iede5ae0269a2bb2e4f2e6cef4af50d57e200938d

diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 9dad95b..2381383 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -573,7 +573,7 @@ bool SwTextFrm::PaintEmpty( const SwRect &rRect, bool bCheck ) const
     return false;
 }
 
-void SwTextFrm::Paint(vcl::RenderContext& /*rRenderContext*/, SwRect const& rRect, SwPrintData const*const) const
+void SwTextFrm::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const
 {
     ResetRepaint();
 
@@ -581,10 +581,10 @@ void SwTextFrm::Paint(vcl::RenderContext& /*rRenderContext*/, SwRect const& rRec
     SwViewShell *pSh = getRootFrm()->GetCurrShell();
 
     Num_Info aNumInfo( *this );
-    SwTaggedPDFHelper aTaggedPDFHelperNumbering( &aNumInfo, 0, 0, *pSh->GetOut() );
+    SwTaggedPDFHelper aTaggedPDFHelperNumbering( &aNumInfo, 0, 0, rRenderContext );
 
     Frm_Info aFrmInfo( *this );
-    SwTaggedPDFHelper aTaggedPDFHelperParagraph( 0, &aFrmInfo, 0, *pSh->GetOut() );
+    SwTaggedPDFHelper aTaggedPDFHelperParagraph( 0, &aFrmInfo, 0, rRenderContext );
 
     if( !IsEmpty() || !PaintEmpty( rRect, true ) )
     {