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
---
 dbaccess/source/ui/control/RelationControl.cxx        | 2 +-
 dbaccess/source/ui/control/TableGrantCtrl.cxx         | 2 +-
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx         | 2 +-
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 +-
 dbaccess/source/ui/tabledesign/TEditControl.cxx       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 8e2b99f0c26a..5d60e63c9b51 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -353,7 +353,7 @@ namespace dbaui
         if( aPos.X() < rRect.Right() || aPos.X() + aTextSize.Width() > rRect.Right() ||
             aPos.Y() < rRect.Top() || aPos.Y() + aTextSize.Height() > rRect.Bottom() )
         {
-            rDev.SetClipRegion(Region(rRect));
+            rDev.SetClipRegion(vcl::Region(rRect));
         }
 
         rDev.DrawText( aPos, aText );
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index f334c2b621b1..7a2582e064ce 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -408,7 +408,7 @@ void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect,
         if( aPos.X() < rRect.Right() || aPos.X() + nWidth > rRect.Right() ||
             aPos.Y() < rRect.Top() || aPos.Y() + nHeight > rRect.Bottom() )
         {
-            rDev.SetClipRegion(Region(rRect));
+            rDev.SetClipRegion(vcl::Region(rRect));
         }
 
         rDev.DrawText( aPos, aText );
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 08901ac03c97..4617c1310c17 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -144,7 +144,7 @@ namespace dbaui
         // clipping
         if (aPos.X() < _rRect.Right() || aPos.X() + TxtSize.Width() > _rRect.Right() ||
             aPos.Y() < _rRect.Top() || aPos.Y() + TxtSize.Height() > _rRect.Bottom())
-            _rDev.SetClipRegion(Region(_rRect));
+            _rDev.SetClipRegion(vcl::Region(_rRect));
 
         // allow for a disabled control ...
         bool bEnabled = IsEnabled();
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 97ca36ac2660..1f4c2eaae461 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1207,7 +1207,7 @@ bool OSelectionBrowseBox::SeekRow(long nRow)
 
 void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const
 {
-    rDev.SetClipRegion(Region(rRect));
+    rDev.SetClipRegion(vcl::Region(rRect));
 
     OTableFieldDescRef pEntry = NULL;
     sal_uInt16 nPos = GetColumnPos(nColumnId);
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 566906a08aba..706f0a56c512 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -311,7 +311,7 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect,
     const OUString aText( GetCellText( m_nCurrentPos, nColumnId ));
 
     rDev.Push( PUSH_CLIPREGION );
-    rDev.SetClipRegion(Region(rRect));
+    rDev.SetClipRegion(vcl::Region(rRect));
     rDev.DrawText( rRect, aText, TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER );
     rDev.Pop();
 }
-- 
cgit