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/inc/canvasbitmap.hxx | |
| 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/inc/canvasbitmap.hxx')
| -rw-r--r-- | vcl/inc/canvasbitmap.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index 0f8531d52b7e..e28e51169af7 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -40,8 +40,8 @@ namespace unotools { private: BitmapEx m_aBmpEx; - Bitmap m_aBitmap; - Bitmap m_aAlpha; + ::Bitmap m_aBitmap; + ::Bitmap m_aAlpha; BitmapReadAccess* m_pBmpAcc; BitmapReadAccess* m_pAlphaAcc; com::sun::star::uno::Sequence<sal_Int8> m_aComponentTags; |