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 /sw/source/uibase/inc/glosbib.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 'sw/source/uibase/inc/glosbib.hxx')
-rw-r--r-- | sw/source/uibase/inc/glosbib.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index fc339c174718..622b3cb20692 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -37,12 +37,12 @@ class SwGlossaryHdl; class FEdit : public Edit { public: - FEdit(Window* pParent, const ResId& rResId) + FEdit(vcl::Window* pParent, const ResId& rResId) : Edit(pParent, rResId) { } - FEdit(Window* pParent) + FEdit(vcl::Window* pParent) : Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK) { } @@ -60,7 +60,7 @@ struct GlosBibUserData class SwGlossaryGroupTLB : public SvTabListBox { public: - SwGlossaryGroupTLB(Window* pParent) + SwGlossaryGroupTLB(vcl::Window* pParent) : SvTabListBox(pParent, WB_BORDER|WB_HSCROLL|WB_CLIPCHILDREN|WB_SORT) { } @@ -98,7 +98,7 @@ protected: DECL_LINK(RenameHdl, void *); public: - SwGlossaryGroupDlg(Window * pParent, + SwGlossaryGroupDlg(vcl::Window * pParent, std::vector<OUString> const& rPathArr, SwGlossaryHdl *pGlosHdl); virtual ~SwGlossaryGroupDlg(); |