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 /include/toolkit | |
| 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 'include/toolkit')
| -rw-r--r-- | include/toolkit/awt/vclxgraphics.hxx | 4 | ||||
| -rw-r--r-- | include/toolkit/awt/vclxregion.hxx | 6 | ||||
| -rw-r--r-- | include/toolkit/helper/vclunohelper.hxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index 77c31790c51c..068ed3bfb08a 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -33,7 +33,7 @@ #include <vcl/vclenum.hxx> class OutputDevice; -class Region; +namespace vcl { class Region; } #define INITOUTDEV_FONT 0x0001 @@ -63,7 +63,7 @@ private: Color maLineColor; Color maFillColor; RasterOp meRasterOp; - Region* mpClipRegion; + vcl::Region* mpClipRegion; void initAttrs(); diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index 0aafb8616516..1206a4f6b9c5 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -40,7 +40,7 @@ class VCLXRegion : public ::com::sun::star::awt::XRegion, { private: ::osl::Mutex maMutex; - Region maRegion; + vcl::Region maRegion; protected: ::osl::Mutex& GetMutex() { return maMutex; } @@ -49,8 +49,8 @@ public: VCLXRegion(); virtual ~VCLXRegion(); - void SetRegion( const Region& rRegion ) { maRegion = rRegion; } - const Region& GetRegion() const { return maRegion; } + void SetRegion( const vcl::Region& rRegion ) { maRegion = rRegion; } + const vcl::Region& GetRegion() const { return maRegion; } // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index 08f5a89cb78a..e8a6c9b400f2 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -89,7 +89,7 @@ public: static OutputDevice* GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics>& rxGraphics ); // Region - static Region GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ); + static vcl::Region GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ); // Polygon static Polygon CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ); |