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 /svx/source/fmcomp/gridctrl.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 'svx/source/fmcomp/gridctrl.cxx')
| -rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 5939b8823094..7a8cbabd554c 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -275,7 +275,7 @@ void FmXGridSourcePropListener::_propertyChanged(const PropertyChangeEvent& evt) m_pParent->DataSourcePropertyChanged(evt); } -DbGridControl::NavigationBar::AbsolutePos::AbsolutePos(Window* pParent, WinBits nStyle) +DbGridControl::NavigationBar::AbsolutePos::AbsolutePos(vcl::Window* pParent, WinBits nStyle) :NumericField(pParent, nStyle) { SetMin(1); @@ -326,7 +326,7 @@ void DbGridControl::NavigationBar::PositionDataSource(sal_Int32 nRecord) m_bPositioning = false; } -DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) +DbGridControl::NavigationBar::NavigationBar(vcl::Window* pParent, WinBits nStyle) :Control(pParent, nStyle) ,m_aRecordText(this, WB_VCENTER) ,m_aAbsolute(this, WB_CENTER | WB_VCENTER) @@ -598,7 +598,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich) { bool bAvailable = GetState(nWhich); DbGridControl* pParent = (DbGridControl*)GetParent(); - Window* pWnd = NULL; + vcl::Window* pWnd = NULL; switch (nWhich) { case NavigationBar::RECORD_FIRST: @@ -709,7 +709,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); - Window* pWindows[] = { &m_aRecordText, + vcl::Window* pWindows[] = { &m_aRecordText, &m_aAbsolute, &m_aRecordOf, &m_aRecordCount, @@ -859,7 +859,7 @@ void DbGridRow::SetState(CursorWrapper* pCur, bool bPaintCursor) DbGridControl::DbGridControl( Reference< XComponentContext > _rxContext, - Window* pParent, + vcl::Window* pParent, WinBits nBits) :DbGridControl_Base(pParent, EBBF_NONE, nBits, DEFAULT_BROWSE_MODE ) ,m_xContext(_rxContext) |