fdo#82577: Handle Region

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

Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291

6 files changed, 9 insertions, 9 deletions

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 1a903f74eadb..2a85683d56da 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -300,7 +300,7 @@ namespace {
             pView->DrawMarkedObj(rPrinter);
         else
             rPrintView.CompleteRedraw(&rPrinter,
-                    Region(Rectangle(Point(0,0), rPage.GetSize())));
+                    vcl::Region(Rectangle(Point(0,0), rPage.GetSize())));
 
         rPrinter.SetMapMode(aOriginalMapMode);
 
diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx
index f8900caba5eb..312f1697764d 100644
--- a/sd/source/ui/view/clview.cxx
+++ b/sd/source/ui/view/clview.cxx
@@ -52,7 +52,7 @@ ClientView::~ClientView()
 
 void ClientView::InvalidateOneWin(vcl::Window& rWin)
 {
-    Region aRegion;
+    vcl::Region aRegion;
     CompleteRedraw(&rWin, aRegion);
 }
 
@@ -63,10 +63,10 @@ void ClientView::InvalidateOneWin(vcl::Window& rWin)
 
 void ClientView::InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect)
 {
-    CompleteRedraw(&rWin, Region(rRect));
+    CompleteRedraw(&rWin, vcl::Region(rRect));
 }
 
-void ClientView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector )
+void ClientView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector )
 {
     DrawView::CompleteRedraw(pOutDev, rReg, pRedirector);
 }
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 043abbbcddff..eb94dc6b1372 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -455,7 +455,7 @@ bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAtt
  * Paint-method: Redirect event to the view
  */
 
-void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/)
+void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/)
 {
     if( mpVDev )
     {
@@ -491,7 +491,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::co
  * Paint-Event during running slide show
  */
 
-void DrawView::PresPaint(const Region& rRegion)
+void DrawView::PresPaint(const vcl::Region& rRegion)
 {
     if(mpViewSh)
     {
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 8401254133e0..95b19f3f582c 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -425,7 +425,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin)
                 character in a symbol font */
     GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() );
 
-    mpDrawView->CompleteRedraw( pWin, Region( rRect ) );
+    mpDrawView->CompleteRedraw( pWin, vcl::Region( rRect ) );
 
     if( pWin )
     {
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 2871b5baa1da..98d90a4168d8 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -467,7 +467,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP
 /**
  * The event will be forwarded to the View
  */
-void View::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/)
+void View::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/)
 {
     // execute ??
     if (mnLockRedrawSmph == 0)
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 258bc88f9415..1dcf322653a4 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1370,7 +1370,7 @@ void ViewShell::Paint (const Rectangle&, ::sd::Window* )
 {
 }
 
-void ViewShell::Draw(OutputDevice &, const Region &)
+void ViewShell::Draw(OutputDevice &, const vcl::Region &)
 {
 }