diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /sfx2/source/inc/preview.hxx | |
parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'sfx2/source/inc/preview.hxx')
-rw-r--r-- | sfx2/source/inc/preview.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx index adc5de27dcc3..cbd4da7478a9 100644 --- a/sfx2/source/inc/preview.hxx +++ b/sfx2/source/inc/preview.hxx @@ -26,12 +26,12 @@ class SfxObjectShell; class GDIMetaFile; -class SfxPreviewBase_Impl : public Window +class SfxPreviewBase_Impl : public vcl::Window { protected: ::boost::shared_ptr<GDIMetaFile> pMetaFile; public: - SfxPreviewBase_Impl(Window* pParent, WinBits nStyle); + SfxPreviewBase_Impl(vcl::Window* pParent, WinBits nStyle); void SetObjectShell( SfxObjectShell* pObj ); virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -42,12 +42,12 @@ class SfxPreviewWin_Impl: public SfxPreviewBase_Impl protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - SfxPreviewWin_Impl(Window* pParent, WinBits nStyle) + SfxPreviewWin_Impl(vcl::Window* pParent, WinBits nStyle) : SfxPreviewBase_Impl(pParent, nStyle) { } static void ImpPaint( - const Rectangle& rRect, GDIMetaFile* pFile, Window* pWindow ); + const Rectangle& rRect, GDIMetaFile* pFile, vcl::Window* pWindow ); }; #endif |