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 /extensions | |
| 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 'extensions')
| -rw-r--r-- | extensions/source/scanner/grid.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 38c951c7c171..4956c3fe6566 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -484,7 +484,7 @@ void GridWindow::drawNew() { if( m_nValues && m_pXValues && m_pNewYValues ) { - SetClipRegion(Region(m_aGridArea)); + SetClipRegion(vcl::Region(m_aGridArea)); SetLineColor( Color( COL_YELLOW ) ); for( int i = 0; i < m_nValues-1; i++ ) { diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 38a7bd155b80..15209ce723ce 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -89,7 +89,7 @@ namespace class BubbleWindow : public FloatingWindow { Point maTipPos; - Region maBounds; + vcl::Region maBounds; Polygon maRectPoly; Polygon maTriPoly; OUString maBubbleTitle; @@ -792,7 +792,7 @@ void BubbleWindow::Resize() Rectangle aRect( 0, TIP_HEIGHT, aSize.Width(), aSize.Height() - TIP_HEIGHT ); maRectPoly = Polygon( aRect, 6, 6 ); - Region aRegion( maRectPoly ); + vcl::Region aRegion( maRectPoly ); long nTipOffset = aSize.Width() - TIP_RIGHT_OFFSET + mnTipOffset; Point aPointArr[4]; @@ -801,7 +801,7 @@ void BubbleWindow::Resize() aPointArr[2] = Point( nTipOffset + TIP_WIDTH , TIP_HEIGHT ); aPointArr[3] = Point( nTipOffset, TIP_HEIGHT ); maTriPoly = Polygon( 4, aPointArr ); - Region aTriRegion( maTriPoly ); + vcl::Region aTriRegion( maTriPoly ); aRegion.Union( aTriRegion); maBounds = aRegion; |