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 /formula/source/ui/dlg/parawin.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 'formula/source/ui/dlg/parawin.cxx')
| -rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index d499a6d6d57c..9e3a647eed04 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -35,7 +35,7 @@ namespace formula { -ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg): +ParaWin::ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg): TabPage (pParent, "ParameterPage", "formula/ui/parameter.ui"), pFuncDesc ( NULL ), pMyParent (_pDlg), @@ -81,7 +81,7 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg): get(m_pSlider, "scrollbar"); //lock down initial preferences - Window *pGrid = get<Window>("paramgrid"); + vcl::Window *pGrid = get<vcl::Window>("paramgrid"); pGrid->set_height_request(pGrid->get_preferred_size().Height()); Size aSize(get_preferred_size()); set_width_request(aSize.Width()); |