summaryrefslogtreecommitdiff
path: root/include/sfx2/titledockwin.hxx
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 /include/sfx2/titledockwin.hxx
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 'include/sfx2/titledockwin.hxx')
-rw-r--r--include/sfx2/titledockwin.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx
index 0b1f4dc5ec77..6e45253c9c02 100644
--- a/include/sfx2/titledockwin.hxx
+++ b/include/sfx2/titledockwin.hxx
@@ -39,11 +39,11 @@ namespace sfx2
public:
TitledDockingWindow(
SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow,
- Window* i_pParent, WinBits i_nStyle = 0
+ vcl::Window* i_pParent, WinBits i_nStyle = 0
);
TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow,
- Window* i_pParent, const ResId& i_rResId
+ vcl::Window* i_pParent, const ResId& i_rResId
);
virtual ~TitledDockingWindow();
@@ -81,8 +81,8 @@ namespace sfx2
/** returns the content window, which is to be used as parent window for any content to be displayed
in the docking window.
*/
- ::Window& GetContentWindow() { return m_aContentWindow; }
- const ::Window& GetContentWindow() const { return m_aContentWindow; }
+ vcl::Window& GetContentWindow() { return m_aContentWindow; }
+ const vcl::Window& GetContentWindow() const { return m_aContentWindow; }
ToolBox& GetToolBox() { return m_aToolbox; }
const ToolBox& GetToolBox() const { return m_aToolbox; }