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 /vcl/source/gdi/gdimtf.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 'vcl/source/gdi/gdimtf.cxx')
| -rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index ff71ff3212c9..b631331bad5f 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -531,7 +531,7 @@ void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos, const Size& rSize, size_t nPos ) { - Region aDrawClipRegion; + vcl::Region aDrawClipRegion; MapMode aDrawMap( GetPrefMapMode() ); Size aDestSize( pOut->LogicToPixel( rSize ) ); @@ -843,7 +843,7 @@ void GDIMetaFile::Clip( const Rectangle& i_rClipRect ) else if( nType == META_CLIPREGION_ACTION ) { MetaClipRegionAction* pOldAct = static_cast<MetaClipRegionAction*>(pAct); - Region aNewReg( aCurRect ); + vcl::Region aNewReg( aCurRect ); if( pOldAct->IsClipping() ) aNewReg.Intersect( pOldAct->GetRegion() ); MetaClipRegionAction* pNewAct = new MetaClipRegionAction( aNewReg, true ); @@ -1282,7 +1282,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) MetaClipRegionAction* pAct = static_cast<MetaClipRegionAction*>(pAction); if( pAct->IsClipping() && pAct->GetRegion().HasPolyPolygonOrB2DPolyPolygon() ) - aMtf.AddAction( new MetaClipRegionAction( Region( ImplGetRotatedPolyPolygon( pAct->GetRegion().GetAsPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ) ), true ) ); + aMtf.AddAction( new MetaClipRegionAction( vcl::Region( ImplGetRotatedPolyPolygon( pAct->GetRegion().GetAsPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ) ), true ) ); else { pAction->Duplicate(); @@ -1294,7 +1294,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) case( META_ISECTRECTCLIPREGION_ACTION ): { MetaISectRectClipRegionAction* pAct = static_cast<MetaISectRectClipRegionAction*>(pAction); - aMtf.AddAction( new MetaISectRegionClipRegionAction(Region( + aMtf.AddAction( new MetaISectRegionClipRegionAction(vcl::Region( ImplGetRotatedPolygon( pAct->GetRect(), aRotAnchor, aRotOffset, fSin, fCos )) ) ); } @@ -1303,10 +1303,10 @@ void GDIMetaFile::Rotate( long nAngle10 ) case( META_ISECTREGIONCLIPREGION_ACTION ): { MetaISectRegionClipRegionAction* pAct = static_cast<MetaISectRegionClipRegionAction*>(pAction); - const Region& rRegion = pAct->GetRegion(); + const vcl::Region& rRegion = pAct->GetRegion(); if( rRegion.HasPolyPolygonOrB2DPolyPolygon() ) - aMtf.AddAction( new MetaISectRegionClipRegionAction( Region( ImplGetRotatedPolyPolygon( rRegion.GetAsPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ) ) ) ); + aMtf.AddAction( new MetaISectRegionClipRegionAction( vcl::Region( ImplGetRotatedPolyPolygon( rRegion.GetAsPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ) ) ) ); else { pAction->Duplicate(); @@ -2608,7 +2608,7 @@ sal_uLong GDIMetaFile::GetChecksum() const case META_CLIPREGION_ACTION : { MetaClipRegionAction& rAct = static_cast<MetaClipRegionAction&>(*pAction); - const Region& rRegion = rAct.GetRegion(); + const vcl::Region& rRegion = rAct.GetRegion(); if(rRegion.HasPolyPolygonOrB2DPolyPolygon()) { |