diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/viewsh.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/view/vprint.cxx | 12 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index cb7f1a399442..e2ea4b542c2d 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -365,7 +365,7 @@ public: // Printing for OLE 2.0. static void PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions, - OutputDevice* pOleOut, const Rectangle& rRect ); + vcl::RenderContext& rRenderContext, const Rectangle& rRect ); // Fill temporary doc with selected text for Print or PDF export. SwDoc * FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt ); diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index 68670251d538..3098745c294a 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -583,15 +583,15 @@ bool SwViewShell::PrintOrPDFExport( } void SwViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions, - OutputDevice* pOleOut, const Rectangle& rRect ) + vcl::RenderContext& rRenderContext, const Rectangle& rRect ) { // For printing a shell is needed. Either the Doc already has one, than we // create a new view, or it has none, than we create the first view. SwViewShell *pSh; if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() ) - pSh = new SwViewShell( *pDoc->getIDocumentLayoutAccess().GetCurrentViewShell(), 0, pOleOut,VSHELLFLAG_SHARELAYOUT ); + pSh = new SwViewShell( *pDoc->getIDocumentLayoutAccess().GetCurrentViewShell(), 0, &rRenderContext,VSHELLFLAG_SHARELAYOUT ); else - pSh = new SwViewShell( *pDoc, 0, pOpt, pOleOut); + pSh = new SwViewShell( *pDoc, 0, pOpt, &rRenderContext); { SET_CURR_SHELL( pSh ); @@ -614,11 +614,11 @@ void SwViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintD // document because the thumbnail creation will not trigger a complete // formatting of the document. - pOleOut->Push( PushFlags::CLIPREGION ); - pOleOut->IntersectClipRegion( aSwRect.SVRect() ); + rRenderContext.Push( PushFlags::CLIPREGION ); + rRenderContext.IntersectClipRegion( aSwRect.SVRect() ); pSh->GetLayout()->Paint( aSwRect ); - pOleOut->Pop(); + rRenderContext.Pop(); // first the CurrShell object needs to be destroyed! } delete pSh; diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 55e3b7439c06..e060a1e9ab03 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -831,7 +831,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, pDev->SetBackground(); const bool bWeb = this->ISA(SwWebDocShell); SwPrintData aOpts; - SwViewShell::PrtOle2(m_pDoc, SW_MOD()->GetUsrPref(bWeb), aOpts, pDev, aRect); + SwViewShell::PrtOle2(m_pDoc, SW_MOD()->GetUsrPref(bWeb), aOpts, *pDev, aRect); pDev->Pop(); if( pOrig ) |