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 /sw/source/ui/dialog | |
| 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 'sw/source/ui/dialog')
| -rw-r--r-- | sw/source/ui/dialog/ascfldlg.cxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index bf7fed52c32f..025441896349 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -63,11 +63,11 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ) : GenericDialogController(pParent, "modules/swriter/ui/asciifilterdialog.ui", "AsciiFilterDialog") , m_bSaveLineStatus(true) - , m_xCharSetLB(new TextEncodingBox(m_xBuilder->weld_combo_box_text("charset"))) + , m_xCharSetLB(new TextEncodingBox(m_xBuilder->weld_combo_box("charset"))) , m_xFontFT(m_xBuilder->weld_label("fontft")) - , m_xFontLB(m_xBuilder->weld_combo_box_text("font")) + , m_xFontLB(m_xBuilder->weld_combo_box("font")) , m_xLanguageFT(m_xBuilder->weld_label("languageft")) - , m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box_text("language"))) + , m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("language"))) , m_xCRLF_RB(m_xBuilder->weld_radio_button("crlf")) , m_xCR_RB(m_xBuilder->weld_radio_button("cr")) , m_xLF_RB(m_xBuilder->weld_radio_button("lf")) @@ -320,7 +320,7 @@ LineEnd SwAsciiFilterDlg::GetCRLF() const return eEnd; } -IMPL_LINK_NOARG( SwAsciiFilterDlg, CharSetSelHdl, weld::ComboBoxText&, void ) +IMPL_LINK_NOARG( SwAsciiFilterDlg, CharSetSelHdl, weld::ComboBox&, void ) { LineEnd eOldEnd = GetCRLF(), eEnd = LineEnd(-1); LanguageType nLng = m_xFontLB->get_visible() diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 659a5473df04..db55f59555ae 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1830,7 +1830,7 @@ SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(TabPageParent pParent, , m_xFootnoteNtNumFormatCB(m_xBuilder->weld_check_button("ftnntnumfmt")) , m_xFootnotePrefixFT(m_xBuilder->weld_label("ftnprefix_label")) , m_xFootnotePrefixED(m_xBuilder->weld_entry("ftnprefix")) - , m_xFootnoteNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("ftnnumviewbox"))) + , m_xFootnoteNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("ftnnumviewbox"))) , m_xFootnoteSuffixFT(m_xBuilder->weld_label("ftnsuffix_label")) , m_xFootnoteSuffixED(m_xBuilder->weld_entry("ftnsuffix")) , m_xEndNtAtTextEndCB(m_xBuilder->weld_check_button("endntattextend")) @@ -1840,7 +1840,7 @@ SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(TabPageParent pParent, , m_xEndNtNumFormatCB(m_xBuilder->weld_check_button("endntnumfmt")) , m_xEndPrefixFT(m_xBuilder->weld_label("endprefix_label")) , m_xEndPrefixED(m_xBuilder->weld_entry("endprefix")) - , m_xEndNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("endnumviewbox"))) + , m_xEndNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("endnumviewbox"))) , m_xEndSuffixFT(m_xBuilder->weld_label("endsuffix_label")) , m_xEndSuffixED(m_xBuilder->weld_entry("endsuffix")) { |