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 /include/svx/dlgctl3d.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 'include/svx/dlgctl3d.hxx')
| -rw-r--r-- | include/svx/dlgctl3d.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 3ebb61fb21c2..8d3901bc3a5e 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -55,8 +55,8 @@ protected: void Construct(); public: - Svx3DPreviewControl(Window* pParent, const ResId& rResId); - Svx3DPreviewControl(Window* pParent, WinBits nStyle = 0); + Svx3DPreviewControl(vcl::Window* pParent, const ResId& rResId); + Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle = 0); virtual ~Svx3DPreviewControl(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -111,7 +111,7 @@ class SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewControl void TrySelection(Point aPosPixel); public: - Svx3DLightControl(Window* pParent, WinBits nStyle = 0); + Svx3DLightControl(vcl::Window* pParent, WinBits nStyle = 0); virtual ~Svx3DLightControl(); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; @@ -165,8 +165,8 @@ private: Link maUserSelectionChangeCallback; public: - SvxLightCtl3D( Window* pParent, const ResId& rResId); - SvxLightCtl3D( Window* pParent); + SvxLightCtl3D( vcl::Window* pParent, const ResId& rResId); + SvxLightCtl3D( vcl::Window* pParent); virtual ~SvxLightCtl3D(); // react to size changes |