summaryrefslogtreecommitdiff
path: root/accessibility/inc/accessibility/standard
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /accessibility/inc/accessibility/standard
parent7cbbefae224ab85343accb42b03f9431ec693a83 (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 'accessibility/inc/accessibility/standard')
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx4
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx2
2 files changed, 3 insertions, 3 deletions
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 );