diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-28 09:57:31 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-28 10:14:33 +0200 |
commit | 46e7991be05a39a24e0a559db6ff1aea0ebc14e5 (patch) | |
tree | 8f8c0adade71df8d0183569c4fb1aee1c30dc650 | |
parent | 7e495e2b9e7b52ed169c936b63d960958db310cd (diff) |
tdf#92914 SwPagePreviewLayout::Paint: handle rendercontext
With this, the print preview window no longer performs direct paint.
Change-Id: I53f05d8a3b723bc131f21a485e0ffec71484670a
-rw-r--r-- | sw/inc/pagepreviewlayout.hxx | 5 | ||||
-rw-r--r-- | sw/inc/viewsh.hxx | 1 | ||||
-rw-r--r-- | sw/source/core/view/pagepreviewlayout.cxx | 24 | ||||
-rw-r--r-- | sw/source/uibase/uiview/pview.cxx | 2 |
4 files changed, 32 insertions, 0 deletions
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx index 828b1a11ee04..c18a43738509 100644 --- a/sw/inc/pagepreviewlayout.hxx +++ b/sw/inc/pagepreviewlayout.hxx @@ -569,6 +569,11 @@ public: @author FME */ sal_uInt16 ConvertAbsoluteToRelativePageNum( sal_uInt16 _nAbsPageNum ) const; + + SwViewShell& GetParentViewShell() + { + return mrParentViewShell; + } }; #endif // INCLUDED_SW_INC_PAGEPREVIEWLAYOUT_HXX diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 6695b121e5a6..6e99bc160429 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -350,6 +350,7 @@ public: inline vcl::RenderContext* GetOut() const { return mpOut; } void SetWin(vcl::Window* win) { mpWin = win; } + void SetOut(vcl::RenderContext* pOut) { mpOut = pOut; } static inline bool IsLstEndAction() { return SwViewShell::mbLstAct; } // Change of all page descriptors. diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index f088700f8892..069c07be107c 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -986,12 +986,36 @@ SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount( // methods to paint page preview layout +namespace +{ +/// Similar to RenderContextGuard, but does not touch the draw view. +class PreviewRenderContextGuard +{ + VclPtr<vcl::RenderContext> m_pOriginalValue; + SwViewShell& m_rShell; + +public: + PreviewRenderContextGuard(SwViewShell& rShell, vcl::RenderContext* pValue) + : m_pOriginalValue(rShell.GetOut()), + m_rShell(rShell) + { + m_rShell.SetOut(pValue); + } + + ~PreviewRenderContextGuard() + { + m_rShell.SetOut(m_pOriginalValue); + } +}; +} + /** paint prepared preview OD 12.12.2002 #103492# */ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rOutRect) const { + PreviewRenderContextGuard aGuard(mrParentViewShell, &rRenderContext); // check environment and parameters { if (!mrParentViewShell.GetWin() && !mrParentViewShell.GetOut()->GetConnectMetaFile()) diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 1b8993604bfc..39ed4bc0f334 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -234,7 +234,9 @@ void SwPagePreviewWin::Paint(vcl::RenderContext& rRenderContext, const Rectangl aMM.SetScaleX(maScale); aMM.SetScaleY(maScale); rRenderContext.SetMapMode(aMM); + mpPgPreviewLayout->GetParentViewShell().setOutputToWindow(true); mpPgPreviewLayout->Paint(rRenderContext, rRect); + mpPgPreviewLayout->GetParentViewShell().setOutputToWindow(false); } } |