diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-27 14:52:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-30 09:58:23 +0200 |
| commit | 8dbde0845a3989528614addb9bd0333f60c522a5 (patch) | |
| tree | c1f13bfc8e2841427eb6a07e2147445b309b1e9a /svx/source/svdraw/svdpagv.cxx | |
| parent | b69478acff4f5b7a9d334a765a1a528d44d7b3a4 (diff) | |
fdo#82577: Handle Region
Put the VCL Region class in the vcl namespace. Avoids clash with the X11
Region typedef.
Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291
Diffstat (limited to 'svx/source/svdraw/svdpagv.cxx')
| -rw-r--r-- | svx/source/svdraw/svdpagv.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index c03339346cef..f8ae2586fec4 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -282,7 +282,7 @@ void SdrPageView::PrePaint() } } -void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) const +void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) const { if(GetPage()) { @@ -345,11 +345,11 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::con // Copy existing paint region to use the same as prepared in BeginDrawLayer SdrPaintWindow& rExistingPaintWindow = pPreparedTarget->GetPaintWindow(); - const Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion(); + const vcl::Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion(); bool bUseRect(false); if (!rRect.IsEmpty()) { - Region r(rExistingRegion); + vcl::Region r(rExistingRegion); r.Intersect(rRect); // fdo#74435: FIXME: visibility check broken if empty if (!r.IsEmpty()) @@ -358,7 +358,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::con if (!bUseRect) aTemporaryPaintWindow.SetRedrawRegion(rExistingRegion); else - aTemporaryPaintWindow.SetRedrawRegion(Region(rRect)); + aTemporaryPaintWindow.SetRedrawRegion(vcl::Region(rRect)); // patch the ExistingPageWindow pPreparedTarget->patchPaintWindow(aTemporaryPaintWindow); @@ -386,7 +386,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::con { SdrPageWindow* pExistingPageWindow = GetPageWindow(0L); SdrPaintWindow& rExistingPaintWindow = pExistingPageWindow->GetPaintWindow(); - const Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion(); + const vcl::Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion(); aTemporaryPaintWindow.SetRedrawRegion(rExistingRegion); } |