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/lnkbase2.cxx | |
| parent | Disable HTML export "hspace" and "vspace" check on OSX (diff) | |
| download | core-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip | |
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/lnkbase2.cxx')
| -rw-r--r-- | sfx2/source/appl/lnkbase2.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 81f960b6040d..cc1cdfcbd478 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -48,7 +48,7 @@ struct BaseLink_Impl { Link m_aEndEditLink; LinkManager* m_pLinkMgr; - Window* m_pParentWin; + vcl::Window* m_pParentWin; FileDialogHelper* m_pFileDlg; bool m_bIsConnect; @@ -435,7 +435,7 @@ SvBaseLink::UpdateResult SvBaseLink::DataChanged( const OUString &, const ::com: return SUCCESS; } -void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl ) +void SvBaseLink::Edit( vcl::Window* pParent, const Link& rEndEditHdl ) { pImpl->m_pParentWin = pParent; pImpl->m_aEndEditLink = rEndEditHdl; |