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/workben | |
| 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/workben')
| -rw-r--r-- | svx/workben/msview/msview.cxx | 4 | ||||
| -rw-r--r-- | svx/workben/pixelctl.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index 302a07ec7ac7..9a05f388a0e0 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -509,7 +509,7 @@ public: class AtomContainerTreeListBox : public SvTreeListBox { public: - AtomContainerTreeListBox( Window* pParent ); + AtomContainerTreeListBox( vcl::Window* pParent ); ~AtomContainerTreeListBox(); void SetRootAtom( const Atom* pAtom ); @@ -544,7 +544,7 @@ private: typedef std::pair< AtomContainerTreeListBox*, SvTreeListEntry* > AtomContainerEntryPair; -AtomContainerTreeListBox::AtomContainerTreeListBox( Window* pParent ) +AtomContainerTreeListBox::AtomContainerTreeListBox( vcl::Window* pParent ) : SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_HASBUTTONSATROOT|WB_3DLOOK|WB_BORDER ), mpRootAtom( 0 ), mbRecursiveGuard( false ) { diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx index 1ef6da03bf1f..37e106e380d9 100644 --- a/svx/workben/pixelctl.cxx +++ b/svx/workben/pixelctl.cxx @@ -69,7 +69,7 @@ class MyWin : public WorkWindow SvxPixelCtl maPixelCtl; public: - MyWin( Window* pParent, WinBits nWinStyle ); + MyWin( vcl::Window* pParent, WinBits nWinStyle ); void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -91,7 +91,7 @@ void Main() Application::Execute(); } -MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : +MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ), maPixelCtl( this ) { |