diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-14 15:07:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-17 15:11:47 +0200 |
| commit | 76c7cabc42a239dbaf9e72122d36fb213e5a3555 (patch) | |
| tree | 94eac2ae99855b7410168ad4f7be9ea9a8a02d60 /reportdesign | |
| parent | 60a23d5d5f0963cd9bea7711ff4336418e3d6392 (diff) | |
rename to weld::ComboBox are they are not text only now
Change-Id: Ice26d1fd2ad97a6959c6916fef428777efea9c2d
Reviewed-on: https://gerrit.libreoffice.org/60500
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/DateTime.cxx | 6 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/DateTime.hxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 69f5cd531e05..3b4af89387d8 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -48,10 +48,10 @@ ODateTimeDialog::ODateTimeDialog(weld::Window* _pParent, const uno::Reference< r , m_xHoldAlive(_xHoldAlive) , m_xDate(m_xBuilder->weld_check_button("date")) , m_xFTDateFormat(m_xBuilder->weld_label("datelistbox_label")) - , m_xDateListBox(m_xBuilder->weld_combo_box_text("datelistbox")) + , m_xDateListBox(m_xBuilder->weld_combo_box("datelistbox")) , m_xTime(m_xBuilder->weld_check_button("time")) , m_xFTTimeFormat(m_xBuilder->weld_label("timelistbox_label")) - , m_xTimeListBox(m_xBuilder->weld_combo_box_text("timelistbox")) + , m_xTimeListBox(m_xBuilder->weld_combo_box("timelistbox")) , m_xPB_OK(m_xBuilder->weld_button("ok")) { try @@ -77,7 +77,7 @@ ODateTimeDialog::ODateTimeDialog(weld::Window* _pParent, const uno::Reference< r void ODateTimeDialog::InsertEntry(sal_Int16 _nNumberFormatId) { const bool bTime = util::NumberFormat::TIME == _nNumberFormatId; - weld::ComboBoxText* pListBox = m_xDateListBox.get(); + weld::ComboBox* pListBox = m_xDateListBox.get(); if (bTime) pListBox = m_xTimeListBox.get(); diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 0d5953498627..9d31be427b30 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -43,10 +43,10 @@ class ODateTimeDialog : public weld::GenericDialogController std::unique_ptr<weld::CheckButton> m_xDate; std::unique_ptr<weld::Label> m_xFTDateFormat; - std::unique_ptr<weld::ComboBoxText> m_xDateListBox; + std::unique_ptr<weld::ComboBox> m_xDateListBox; std::unique_ptr<weld::CheckButton> m_xTime; std::unique_ptr<weld::Label> m_xFTTimeFormat; - std::unique_ptr<weld::ComboBoxText> m_xTimeListBox; + std::unique_ptr<weld::ComboBox> m_xTimeListBox; std::unique_ptr<weld::Button> m_xPB_OK; /** returns the format string |