diff options
Diffstat (limited to 'include/toolkit/awt')
| -rw-r--r-- | include/toolkit/awt/vclxgraphics.hxx | 4 | ||||
| -rw-r--r-- | include/toolkit/awt/vclxregion.hxx | 6 |
2 files changed, 5 insertions, 5 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; |