From 8dbde0845a3989528614addb9bd0333f60c522a5 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Sat, 27 Sep 2014 14:52:40 +0200
Subject: fdo#82577: Handle Region

Put the VCL Region class in the vcl namespace. Avoids clash with the X11
Region typedef.

Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291
---
 sd/source/ui/docshell/docshel2.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sd/source/ui/docshell/docshel2.cxx')

diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index d4882e594b0f..c0bf1fcf8b34 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -109,7 +109,7 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, sal_uInt16 nAspect)
             pOut->SetMapMode(aMapMode);
         }
 
-        Region aRegion(aVisArea);
+        vcl::Region aRegion(aVisArea);
         pView->CompleteRedraw(pOut, aRegion);
 
         if (pOut->GetOutDevType() == OUTDEV_PRINTER)
@@ -263,7 +263,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe
             pView->SetActiveLayer( pFrameView->GetActiveLayer() );
     }
 
-    pView->CompleteRedraw( &aVDev, Region(Rectangle(aNullPt, aSize)) );
+    pView->CompleteRedraw( &aVDev, vcl::Region(Rectangle(aNullPt, aSize)) );
 
     // IsRedrawReady() always gives sal_True while ( !pView->IsRedrawReady() ) {}
     delete pView;
-- 
cgit v1.2.3