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 /cui/source/inc/dlgname.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 'cui/source/inc/dlgname.hxx')
-rw-r--r-- | cui/source/inc/dlgname.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index a4a306f564f1..e6d9ea26c9fd 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -39,7 +39,7 @@ private: DECL_LINK(ModifyHdl, void *); public: - SvxNameDialog( Window* pWindow, const OUString& rName, const OUString& rDesc ); + SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); void GetName( OUString& rName ){rName = pEdtName->GetText();} @@ -87,7 +87,7 @@ private: public: // constructor - SvxObjectNameDialog(Window* pWindow, const OUString& rName); + SvxObjectNameDialog(vcl::Window* pWindow, const OUString& rName); // data access void GetName(OUString& rName) {rName = pEdtName->GetText(); } @@ -117,7 +117,7 @@ private: public: // constructor - SvxObjectTitleDescDialog(Window* pWindow, const OUString& rTitle, const OUString& rDesc); + SvxObjectTitleDescDialog(vcl::Window* pWindow, const OUString& rTitle, const OUString& rDesc); // data access void GetTitle(OUString& rTitle) {rTitle = pEdtTitle->GetText(); } @@ -138,7 +138,7 @@ private: DECL_LINK(Button2Hdl, void *); public: - SvxMessDialog( Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); + SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); virtual ~SvxMessDialog(); void SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt ); |