From 827c46e7d75000cb03b0ce21759f9d0825f0c096 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Sep 2014 11:20:40 +0200 Subject: fdo#82577: Handle Window Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a --- accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx | 4 ++-- accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'accessibility/inc/accessibility/standard') diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx index 7861dc397e0c..a792d51cccad 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx @@ -24,7 +24,7 @@ class VclSimpleEvent; class VclWindowEvent; -class Window; +namespace vcl { class Window; } @@ -34,7 +34,7 @@ class Window; class VCLXAccessibleMenuBar : public OAccessibleMenuComponent { protected: - Window* m_pWindow; + vcl::Window* m_pWindow; virtual bool IsFocused() SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx index 2a4defcbfad2..213a570b853c 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx @@ -49,7 +49,7 @@ private: void UpdateAllItems_Impl(); void UpdateItemName_Impl( sal_Int32 _nPos ); void UpdateItemEnabled_Impl( sal_Int32 _nPos ); - void UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen ); + void UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, bool bOpen ); void HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow ); void ReleaseSubToolBox( ToolBox* _pSubToolBox ); -- cgit v1.2.3