From 76c7cabc42a239dbaf9e72122d36fb213e5a3555 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 14 Sep 2018 15:07:17 +0100 Subject: rename to weld::ComboBox are they are not text only now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ice26d1fd2ad97a6959c6916fef428777efea9c2d Reviewed-on: https://gerrit.libreoffice.org/60500 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- writerperfect/source/common/WPFTEncodingDialog.cxx | 11 ++++------- writerperfect/source/writer/EPUBExportDialog.cxx | 12 ++++++------ writerperfect/source/writer/EPUBExportDialog.hxx | 12 ++++++------ 3 files changed, 16 insertions(+), 19 deletions(-) (limited to 'writerperfect/source') 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 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")) { diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx b/writerperfect/source/writer/EPUBExportDialog.cxx index 935858dfd27d..9b3d5618a492 100644 --- a/writerperfect/source/writer/EPUBExportDialog.cxx +++ b/writerperfect/source/writer/EPUBExportDialog.cxx @@ -77,9 +77,9 @@ EPUBExportDialog::EPUBExportDialog(weld::Window* pParent, , m_xContext(std::move(xContext)) , m_rFilterData(rFilterData) , m_xSourceDocument(std::move(xDocument)) - , m_xVersion(m_xBuilder->weld_combo_box_text("versionlb")) - , m_xSplit(m_xBuilder->weld_combo_box_text("splitlb")) - , m_xLayout(m_xBuilder->weld_combo_box_text("layoutlb")) + , m_xVersion(m_xBuilder->weld_combo_box("versionlb")) + , m_xSplit(m_xBuilder->weld_combo_box("splitlb")) + , m_xLayout(m_xBuilder->weld_combo_box("layoutlb")) , m_xCoverPath(m_xBuilder->weld_entry("coverpath")) , m_xCoverButton(m_xBuilder->weld_button("coverbutton")) , m_xMediaDir(m_xBuilder->weld_entry("mediadir")) @@ -160,19 +160,19 @@ EPUBExportDialog::EPUBExportDialog(weld::Window* pParent, m_xOKButton->connect_clicked(LINK(this, EPUBExportDialog, OKClickHdl)); } -IMPL_LINK_NOARG(EPUBExportDialog, VersionSelectHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(EPUBExportDialog, VersionSelectHdl, weld::ComboBox&, void) { m_rFilterData["EPUBVersion"] <<= PositionToVersion(m_xVersion->get_active()); } -IMPL_LINK_NOARG(EPUBExportDialog, SplitSelectHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(EPUBExportDialog, SplitSelectHdl, weld::ComboBox&, void) { // No conversion, 1:1 mapping between entry positions and // libepubgen::EPUBSplitMethod. m_rFilterData["EPUBSplitMethod"] <<= static_cast(m_xSplit->get_active()); } -IMPL_LINK_NOARG(EPUBExportDialog, LayoutSelectHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(EPUBExportDialog, LayoutSelectHdl, weld::ComboBox&, void) { // No conversion, 1:1 mapping between entry positions and // libepubgen::EPUBLayoutMethod. diff --git a/writerperfect/source/writer/EPUBExportDialog.hxx b/writerperfect/source/writer/EPUBExportDialog.hxx index 6852b11a6bbb..819022531b13 100644 --- a/writerperfect/source/writer/EPUBExportDialog.hxx +++ b/writerperfect/source/writer/EPUBExportDialog.hxx @@ -29,9 +29,9 @@ public: ~EPUBExportDialog() override; private: - DECL_LINK(VersionSelectHdl, weld::ComboBoxText&, void); - DECL_LINK(SplitSelectHdl, weld::ComboBoxText&, void); - DECL_LINK(LayoutSelectHdl, weld::ComboBoxText&, void); + DECL_LINK(VersionSelectHdl, weld::ComboBox&, void); + DECL_LINK(SplitSelectHdl, weld::ComboBox&, void); + DECL_LINK(LayoutSelectHdl, weld::ComboBox&, void); DECL_LINK(CoverClickHdl, weld::Button&, void); DECL_LINK(MediaClickHdl, weld::Button&, void); DECL_LINK(OKClickHdl, weld::Button&, void); @@ -40,9 +40,9 @@ private: comphelper::SequenceAsHashMap& m_rFilterData; css::uno::Reference m_xSourceDocument; - std::unique_ptr m_xVersion; - std::unique_ptr m_xSplit; - std::unique_ptr m_xLayout; + std::unique_ptr m_xVersion; + std::unique_ptr m_xSplit; + std::unique_ptr m_xLayout; std::unique_ptr m_xCoverPath; std::unique_ptr m_xCoverButton; std::unique_ptr m_xMediaDir; -- cgit