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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 12 | ||||
| -rw-r--r-- | sfx2/source/dialog/newstyle.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 980f7dda4abc..4cef840d4ef6 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -57,13 +57,13 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(TabPageParent pParent, const Sf , m_xName(m_xBuilder->weld_entry("name")) , m_xAutoCB(m_xBuilder->weld_check_button("autoupdate")) , m_xFollowFt(m_xBuilder->weld_label("nextstyleft")) - , m_xFollowLb(m_xBuilder->weld_combo_box_text("nextstyle")) + , m_xFollowLb(m_xBuilder->weld_combo_box("nextstyle")) , m_xEditStyleBtn(m_xBuilder->weld_button("editstyle")) , m_xBaseFt(m_xBuilder->weld_label("linkedwithft")) - , m_xBaseLb(m_xBuilder->weld_combo_box_text("linkedwith")) + , m_xBaseLb(m_xBuilder->weld_combo_box("linkedwith")) , m_xEditLinkStyleBtn(m_xBuilder->weld_button("editlinkstyle")) , m_xFilterFt(m_xBuilder->weld_label("categoryft")) - , m_xFilterLb(m_xBuilder->weld_combo_box_text("category")) + , m_xFilterLb(m_xBuilder->weld_combo_box("category")) , m_xDescFt(m_xBuilder->weld_label("desc")) , m_xNameFt(m_xBuilder->weld_label("nameft")) { @@ -250,7 +250,7 @@ void SfxManageStyleSheetPage::dispose() SfxTabPage::dispose(); } -void SfxManageStyleSheetPage::UpdateName_Impl( weld::ComboBoxText* pBox, +void SfxManageStyleSheetPage::UpdateName_Impl( weld::ComboBox* pBox, const OUString& rNew ) /* [Description] @@ -312,7 +312,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() m_xDescFt->set_label(pStyle->GetDescription(eUnit)); } -IMPL_LINK_NOARG(SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, weld::ComboBox&, void) { OUString aTemplName(m_xFollowLb->get_active_text()); OUString aEditTemplName(m_xName->get_text()); @@ -328,7 +328,7 @@ IMPL_LINK_NOARG(SfxManageStyleSheetPage, EditStyleHdl_Impl, weld::Button&, void) Execute_Impl(SID_STYLE_EDIT, aTemplName, static_cast<sal_uInt16>(pStyle->GetFamily())); } -IMPL_LINK_NOARG(SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, weld::ComboBox&, void) { int linkSelectPos = m_xBaseLb->get_active(); if ( linkSelectPos == 0 ) diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 24d0f570ad3c..003a58f0eb92 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -54,7 +54,7 @@ IMPL_LINK_NOARG(SfxNewStyleDlg, OKHdl, weld::TreeView&, void) OKClickHdl(*m_xOKBtn); } -IMPL_LINK(SfxNewStyleDlg, ModifyHdl, weld::ComboBoxText&, rBox, void) +IMPL_LINK(SfxNewStyleDlg, ModifyHdl, weld::ComboBox&, rBox, void) { m_xOKBtn->set_sensitive(!rBox.get_active_text().replaceAll(" ", "").isEmpty()); } |