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 /sc/source/ui/dbgui/dbnamdlg.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 'sc/source/ui/dbgui/dbnamdlg.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/dbnamdlg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 022283e06e78..c46be30d3661 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -111,7 +111,7 @@ void DBSaveData::Restore() // class ScDbNameDlg -ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData) : ScAnyRefDlg(pB, pCW, pParent, "DefineDatabaseRangeDialog", @@ -140,9 +140,9 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, get(m_pBtnCancel, "cancel"); get(m_pBtnAdd, "add"); aStrAdd = m_pBtnAdd->GetText(); - aStrModify = get<Window>("modify")->GetText(); + aStrModify = get<vcl::Window>("modify")->GetText(); get(m_pBtnRemove, "delete"); - aStrInvalid = get<Window>("invalid")->GetText(); + aStrInvalid = get<vcl::Window>("invalid")->GetText(); m_pFTSource->SetStyle(m_pFTSource->GetStyle() | WB_NOLABEL); m_pFTOperations->SetStyle(m_pFTOperations->GetStyle() | WB_NOLABEL); |