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 /extensions/source/propctrlr/browserview.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 'extensions/source/propctrlr/browserview.cxx')
-rw-r--r-- | extensions/source/propctrlr/browserview.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 3ce6501c41c9..f56532cab6d0 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -30,7 +30,7 @@ namespace pcr //= class OPropertyBrowserView - OPropertyBrowserView::OPropertyBrowserView(Window* _pParent, WinBits nBits) + OPropertyBrowserView::OPropertyBrowserView(vcl::Window* _pParent, WinBits nBits) :Window(_pParent, nBits | WB_3DLOOK) ,m_nActivePage(0) { @@ -58,7 +58,7 @@ namespace pcr sal_uInt16 nTmpPage = m_pPropBox->GetCurPage(); if (nTmpPage) m_nActivePage = nTmpPage; - boost::scoped_ptr<Window> aTemp(m_pPropBox); + boost::scoped_ptr<vcl::Window> aTemp(m_pPropBox); m_pPropBox = NULL; } |