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 /include/sfx2/infobar.hxx | |
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 'include/sfx2/infobar.hxx')
-rw-r--r-- | include/sfx2/infobar.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 383ebc868b59..386e4150dfca 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -25,7 +25,7 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow SfxBindings* m_pBindings; public: - SfxInfoBarContainerChild( Window* pParent, + SfxInfoBarContainerChild( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); @@ -38,7 +38,7 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow /** Class representing a single InfoBar to be added in a SfxInfoBarContainerWindow. */ -class SfxInfoBarWindow : public Window +class SfxInfoBarWindow : public vcl::Window { private: OUString m_sId; @@ -47,7 +47,7 @@ class SfxInfoBarWindow : public Window std::vector< PushButton* > m_aActionBtns; public: - SfxInfoBarWindow( Window* parent, const OUString& sId, + SfxInfoBarWindow( vcl::Window* parent, const OUString& sId, const OUString& sMessage, std::vector< PushButton* > aButtons ); virtual ~SfxInfoBarWindow( ); @@ -60,7 +60,7 @@ class SfxInfoBarWindow : public Window DECL_LINK( CloseHandler, void* ); }; -class SfxInfoBarContainerWindow : public Window +class SfxInfoBarContainerWindow : public vcl::Window { private: SfxInfoBarContainerChild* m_pChildWin; |