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 /reportdesign/source/ui/inc/ViewsWindow.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 'reportdesign/source/ui/inc/ViewsWindow.hxx')
| -rw-r--r-- | reportdesign/source/ui/inc/ViewsWindow.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index f4c457728e81..fb8fff7cb894 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -75,24 +75,24 @@ namespace rptui class OWindowPositionCorrector { - ::std::vector< ::std::pair<Window*,Point> > m_aChildren; + ::std::vector< ::std::pair<vcl::Window*,Point> > m_aChildren; long m_nDeltaX; long m_nDeltaY; public: - OWindowPositionCorrector(Window* _pWindow,long _nDeltaX, long _nDeltaY) :m_nDeltaX(_nDeltaX), m_nDeltaY(_nDeltaY) + OWindowPositionCorrector(vcl::Window* _pWindow,long _nDeltaX, long _nDeltaY) :m_nDeltaX(_nDeltaX), m_nDeltaY(_nDeltaY) { sal_uInt16 nCount = _pWindow->GetChildCount(); m_aChildren.reserve(nCount); while( nCount ) { - Window* pChild = _pWindow->GetChild(--nCount); - m_aChildren.push_back(::std::pair<Window*,Point>(pChild,pChild->GetPosPixel())); + vcl::Window* pChild = _pWindow->GetChild(--nCount); + m_aChildren.push_back(::std::pair<vcl::Window*,Point>(pChild,pChild->GetPosPixel())); } } ~OWindowPositionCorrector() { - ::std::vector< ::std::pair<Window*,Point> >::iterator aIter = m_aChildren.begin(); - ::std::vector< ::std::pair<Window*,Point> >::iterator aEnd = m_aChildren.end(); + ::std::vector< ::std::pair<vcl::Window*,Point> >::iterator aIter = m_aChildren.begin(); + ::std::vector< ::std::pair<vcl::Window*,Point> >::iterator aEnd = m_aChildren.end(); for (; aIter != aEnd; ++aIter) { const Point aPos = aIter->first->GetPosPixel(); @@ -102,7 +102,7 @@ namespace rptui } }; - class OViewsWindow : public Window + class OViewsWindow : public vcl::Window , public utl::ConfigurationListener , public IMarkedSection { |