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 /toolkit/source/helper | |
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 'toolkit/source/helper')
-rw-r--r-- | toolkit/source/helper/vclunohelper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |