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 /sfx2/source/appl/impldde.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 'sfx2/source/appl/impldde.cxx')
| -rw-r--r-- | sfx2/source/appl/impldde.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index cf34acc42348..8da693405450 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -64,11 +64,11 @@ class SvDDELinkEditDialog : public ModalDialog DECL_STATIC_LINK( SvDDELinkEditDialog, EditHdl_Impl, Edit* ); public: - SvDDELinkEditDialog( Window* pParent, SvBaseLink* ); + SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* ); OUString GetCmd() const; }; -SvDDELinkEditDialog::SvDDELinkEditDialog( Window* pParent, SvBaseLink* pLink ) +SvDDELinkEditDialog::SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* pLink ) : ModalDialog( pParent, "LinkEditDialog", "sfx/ui/linkeditdialog.ui" ) { get(m_pOKButton, "ok"); @@ -253,7 +253,7 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink ) return true; } -void SvDDEObject::Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) +void SvDDEObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) { SvDDELinkEditDialog aDlg( pParent, pBaseLink ); if ( RET_OK == aDlg.Execute() && rEndEditHdl.IsSet() ) |