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 /svx/source/engine3d | |
| 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 'svx/source/engine3d')
| -rw-r--r-- | svx/source/engine3d/float3d.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index d28b3cded20b..d418277476cb 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -84,7 +84,7 @@ namespace { } Svx3DWin::Svx3DWin( SfxBindings* pInBindings, - SfxChildWindow *pCW, Window* pParent ) : + SfxChildWindow *pCW, vcl::Window* pParent ) : SfxDockingWindow ( pInBindings, pCW, pParent, SVX_RES( RID_SVXFLOAT_3D ) ), aBtnGeo ( this, SVX_RES( BTN_GEO ) ), @@ -3231,7 +3231,7 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn ) // Derivation from SfxChildWindow as "containers" for effects -Svx3DChildWindow::Svx3DChildWindow( Window* _pParent, +Svx3DChildWindow::Svx3DChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : |