summaryrefslogtreecommitdiff
path: root/toolkit/source
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/source')
-rw-r--r--toolkit/source/awt/vclxgraphics.cxx8
-rw-r--r--toolkit/source/helper/vclunohelper.cxx4
2 files changed, 6 insertions, 6 deletions
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index 5dd5ba521fa0..7ea33536cc40 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -278,7 +278,7 @@ void VCLXGraphics::setClipRegion( const uno::Reference< awt::XRegion >& rxRegion
delete mpClipRegion;
if ( rxRegion.is() )
- mpClipRegion = new Region( VCLUnoHelper::GetRegion( rxRegion ) );
+ mpClipRegion = new vcl::Region( VCLUnoHelper::GetRegion( rxRegion ) );
else
mpClipRegion = NULL;
}
@@ -289,9 +289,9 @@ void VCLXGraphics::intersectClipRegion( const uno::Reference< awt::XRegion >& rx
if ( rxRegion.is() )
{
- Region aRegion( VCLUnoHelper::GetRegion( rxRegion ) );
+ vcl::Region aRegion( VCLUnoHelper::GetRegion( rxRegion ) );
if ( !mpClipRegion )
- mpClipRegion = new Region( aRegion );
+ mpClipRegion = new vcl::Region( aRegion );
else
mpClipRegion->Intersect( aRegion );
}
@@ -371,7 +371,7 @@ void VCLXGraphics::draw( const uno::Reference< awt::XDisplayBitmap >& rxBitmapHa
}
if(nSourceX || nSourceY || aSz.Width() != nSourceWidth || aSz.Height() != nSourceHeight)
- mpOutputDevice->IntersectClipRegion(Region(Rectangle(nDestX, nDestY, nDestX + nDestWidth - 1, nDestY + nDestHeight - 1)));
+ mpOutputDevice->IntersectClipRegion(vcl::Region(Rectangle(nDestX, nDestY, nDestX + nDestWidth - 1, nDestY + nDestHeight - 1)));
mpOutputDevice->DrawBitmapEx( aPos, aSz, aBmpEx );
}
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 8e4b75a6f194..f8ab1e11f402 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -126,9 +126,9 @@ vcl::Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::
return pVCLXWindow ? pVCLXWindow->GetWindow() : NULL;
}
-Region VCLUnoHelper::GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion )
+vcl::Region VCLUnoHelper::GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion )
{
- Region aRegion;
+ vcl::Region aRegion;
VCLXRegion* pVCLRegion = VCLXRegion::GetImplementation( rxRegion );
if ( pVCLRegion )
aRegion = pVCLRegion->GetRegion();