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 /writerperfect/source/common | |
| 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 'writerperfect/source/common')
| -rw-r--r-- | writerperfect/source/common/WPFTEncodingDialog.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx index a86d888466b2..fe812fc71ee2 100644 --- a/writerperfect/source/common/WPFTEncodingDialog.cxx +++ b/writerperfect/source/common/WPFTEncodingDialog.cxx @@ -78,18 +78,15 @@ std::pair<OUStringLiteral, OUStringLiteral> const s_encodings[] std::size_t const numEncodings = SAL_N_ELEMENTS(s_encodings); -void insertEncodings(weld::ComboBoxText& box) +void insertEncodings(weld::ComboBox& box) { for (std::size_t i = 0; i < numEncodings; ++i) box.append(s_encodings[i].first, s_encodings[i].second); } -void selectEncoding(weld::ComboBoxText& box, const OUString& encoding) -{ - box.set_active_id(encoding); -} +void selectEncoding(weld::ComboBox& box, const OUString& encoding) { box.set_active_id(encoding); } -OUString getEncoding(const weld::ComboBoxText& box) { return box.get_active_id(); } +OUString getEncoding(const weld::ComboBox& box) { return box.get_active_id(); } } WPFTEncodingDialog::WPFTEncodingDialog(weld::Window* pParent, const OUString& title, @@ -97,7 +94,7 @@ WPFTEncodingDialog::WPFTEncodingDialog(weld::Window* pParent, const OUString& ti : GenericDialogController(pParent, "writerperfect/ui/wpftencodingdialog.ui", "WPFTEncodingDialog") , m_userHasCancelled(false) - , m_xLbCharset(m_xBuilder->weld_combo_box_text("comboboxtext")) + , m_xLbCharset(m_xBuilder->weld_combo_box("comboboxtext")) , m_xBtnOk(m_xBuilder->weld_button("ok")) , m_xBtnCancel(m_xBuilder->weld_button("cancel")) { |