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 /svtools/source/toolpanel/toolpaneldeck.cxx | |
| 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 'svtools/source/toolpanel/toolpaneldeck.cxx')
| -rw-r--r-- | svtools/source/toolpanel/toolpaneldeck.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx index 19c0a22febb4..27dfa5146c0f 100644 --- a/svtools/source/toolpanel/toolpaneldeck.cxx +++ b/svtools/source/toolpanel/toolpaneldeck.cxx @@ -87,7 +87,7 @@ namespace svt PDeckLayouter GetLayouter() const { return m_pLayouter; } void SetLayouter( const PDeckLayouter& i_pNewLayouter ); - Window& GetPanelWindowAnchor() { return m_aPanelAnchor; } + vcl::Window& GetPanelWindowAnchor() { return m_aPanelAnchor; } bool IsDead() const { return m_bInDtor; } @@ -130,7 +130,7 @@ namespace svt private: ToolPanelDeck& m_rDeck; - Window m_aPanelAnchor; + vcl::Window m_aPanelAnchor; ToolPanelCollection m_aPanels; PToolPanel m_pDummyPanel; PanelDeckListeners m_aListeners; @@ -341,7 +341,7 @@ namespace svt //= ToolPanelDeck - ToolPanelDeck::ToolPanelDeck( Window& i_rParent, const WinBits i_nStyle ) + ToolPanelDeck::ToolPanelDeck( vcl::Window& i_rParent, const WinBits i_nStyle ) :Control( &i_rParent, i_nStyle ) ,m_pImpl( new ToolPanelDeck_Impl( *this ) ) { @@ -425,13 +425,13 @@ namespace svt } - Window& ToolPanelDeck::GetPanelWindowAnchor() + vcl::Window& ToolPanelDeck::GetPanelWindowAnchor() { return m_pImpl->GetPanelWindowAnchor(); } - const Window& ToolPanelDeck::GetPanelWindowAnchor() const + const vcl::Window& ToolPanelDeck::GetPanelWindowAnchor() const { return m_pImpl->GetPanelWindowAnchor(); } |