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>

7 files changed, 30 insertions, 30 deletions

diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 2ba47edbf3d2..a79e88eb14ef 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -123,7 +123,7 @@ SwEnvFormatPage::SwEnvFormatPage(TabPageParent pParent, const SfxItemSet& rSet)
     , m_xSendLeftField(m_xBuilder->weld_metric_spin_button("leftsender", FUNIT_CM))
     , m_xSendTopField(m_xBuilder->weld_metric_spin_button("topsender", FUNIT_CM))
     , m_xSendEditButton(m_xBuilder->weld_menu_button("senderedit"))
-    , m_xSizeFormatBox(m_xBuilder->weld_combo_box_text("format"))
+    , m_xSizeFormatBox(m_xBuilder->weld_combo_box("format"))
     , m_xSizeWidthField(m_xBuilder->weld_metric_spin_button("width", FUNIT_CM))
     , m_xSizeHeightField(m_xBuilder->weld_metric_spin_button("height", FUNIT_CM))
     , m_xPreview(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreview))
@@ -353,7 +353,7 @@ SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl const * pColl, bool
     return pAddrSet.get();
 }
 
-IMPL_LINK_NOARG(SwEnvFormatPage, FormatHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwEnvFormatPage, FormatHdl, weld::ComboBox&, void)
 {
     long lWidth;
     long lHeight;
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 5fa0bda77de6..20f2bd3844b9 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -36,7 +36,7 @@ class SwEnvFormatPage : public SfxTabPage
     std::unique_ptr<weld::MetricSpinButton>  m_xSendLeftField;
     std::unique_ptr<weld::MetricSpinButton>  m_xSendTopField;
     std::unique_ptr<weld::MenuButton> m_xSendEditButton;
-    std::unique_ptr<weld::ComboBoxText> m_xSizeFormatBox;
+    std::unique_ptr<weld::ComboBox> m_xSizeFormatBox;
     std::unique_ptr<weld::MetricSpinButton>  m_xSizeWidthField;
     std::unique_ptr<weld::MetricSpinButton>  m_xSizeHeightField;
     std::unique_ptr<weld::CustomWeld> m_xPreview;
@@ -44,7 +44,7 @@ class SwEnvFormatPage : public SfxTabPage
     DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void);
     DECL_LINK(AddrEditHdl, const OString&, void);
     DECL_LINK(SendEditHdl, const OString&, void);
-    DECL_LINK(FormatHdl, weld::ComboBoxText&, void);
+    DECL_LINK(FormatHdl, weld::ComboBox&, void);
 
     void SetMinMax();
 
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 23974fd60fa4..2c765de7a5d5 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -185,9 +185,9 @@ SwEnvPage::SwEnvPage(TabPageParent pParent, const SfxItemSet& rSet)
     , m_pDialog(nullptr)
     , m_pSh(nullptr)
     , m_xAddrEdit(m_xBuilder->weld_text_view("addredit"))
-    , m_xDatabaseLB(m_xBuilder->weld_combo_box_text("database"))
-    , m_xTableLB(m_xBuilder->weld_combo_box_text("table"))
-    , m_xDBFieldLB(m_xBuilder->weld_combo_box_text("field"))
+    , m_xDatabaseLB(m_xBuilder->weld_combo_box("database"))
+    , m_xTableLB(m_xBuilder->weld_combo_box("table"))
+    , m_xDBFieldLB(m_xBuilder->weld_combo_box("field"))
     , m_xInsertBT(m_xBuilder->weld_button("insert"))
     , m_xSenderBox(m_xBuilder->weld_check_button("sender"))
     , m_xSenderEdit(m_xBuilder->weld_text_view("senderedit"))
@@ -229,7 +229,7 @@ SwEnvPage::~SwEnvPage()
     disposeOnce();
 }
 
-IMPL_LINK( SwEnvPage, DatabaseHdl, weld::ComboBoxText&, rListBox, void )
+IMPL_LINK( SwEnvPage, DatabaseHdl, weld::ComboBox&, rListBox, void )
 {
     SwWait aWait( *m_pSh->GetView().GetDocShell(), true );
 
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index f69b1ce9f8dc..733d55c6e025 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -225,15 +225,15 @@ SwLabPage::SwLabPage(TabPageParent pParent, const SfxItemSet& rSet)
     , m_xAddressFrame(m_xBuilder->weld_widget("addressframe"))
     , m_xAddrBox(m_xBuilder->weld_check_button("address"))
     , m_xWritingEdit(m_xBuilder->weld_text_view("textview"))
-    , m_xDatabaseLB(m_xBuilder->weld_combo_box_text("database"))
-    , m_xTableLB(m_xBuilder->weld_combo_box_text("table"))
+    , m_xDatabaseLB(m_xBuilder->weld_combo_box("database"))
+    , m_xTableLB(m_xBuilder->weld_combo_box("table"))
     , m_xInsertBT(m_xBuilder->weld_button("insert"))
-    , m_xDBFieldLB(m_xBuilder->weld_combo_box_text("field"))
+    , m_xDBFieldLB(m_xBuilder->weld_combo_box("field"))
     , m_xContButton(m_xBuilder->weld_radio_button("continuous"))
     , m_xSheetButton(m_xBuilder->weld_radio_button("sheet"))
-    , m_xMakeBox(m_xBuilder->weld_combo_box_text("brand"))
-    , m_xTypeBox(m_xBuilder->weld_combo_box_text("type"))
-    , m_xHiddenSortTypeBox(m_xBuilder->weld_combo_box_text("hiddentype"))
+    , m_xMakeBox(m_xBuilder->weld_combo_box("brand"))
+    , m_xTypeBox(m_xBuilder->weld_combo_box("type"))
+    , m_xHiddenSortTypeBox(m_xBuilder->weld_combo_box("hiddentype"))
     , m_xFormatInfo(m_xBuilder->weld_label("formatinfo"))
 {
     WaitObject aWait(pParent.pParent);
@@ -294,7 +294,7 @@ IMPL_LINK_NOARG(SwLabPage, AddrHdl, weld::ToggleButton&, void)
     m_xWritingEdit->grab_focus();
 }
 
-IMPL_LINK( SwLabPage, DatabaseHdl, weld::ComboBoxText&, rListBox, void )
+IMPL_LINK( SwLabPage, DatabaseHdl, weld::ComboBox&, rListBox, void )
 {
     sActDBName = m_xDatabaseLB->get_active_text();
 
@@ -331,7 +331,7 @@ IMPL_LINK_NOARG(SwLabPage, PageHdl, weld::ToggleButton&, void)
     MakeHdl(*m_xMakeBox);
 }
 
-IMPL_LINK_NOARG(SwLabPage, MakeHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwLabPage, MakeHdl, weld::ComboBox&, void)
 {
     weld::WaitObject aWait(GetParentSwLabDlg()->getDialog());
 
@@ -384,7 +384,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, weld::ComboBoxText&, void)
     TypeHdl(*m_xTypeBox);
 }
 
-IMPL_LINK_NOARG(SwLabPage, TypeHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwLabPage, TypeHdl, weld::ComboBox&, void)
 {
     DisplayFormat();
     aItem.m_aType = m_xTypeBox->get_active_text();
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 09f6792ccc0c..f0bb88c3746d 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -520,7 +520,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabDlg* pParent, SwLabRec& rRec)
     , bSuccess(false)
     , m_pLabDialog(pParent)
     , rLabRec(rRec)
-    , m_xMakeCB(m_xBuilder->weld_combo_box_text("brand"))
+    , m_xMakeCB(m_xBuilder->weld_combo_box("brand"))
     , m_xTypeED(m_xBuilder->weld_entry("type"))
     , m_xOKPB(m_xBuilder->weld_button("ok"))
 {
@@ -577,7 +577,7 @@ void SwSaveLabelDlg::Modify()
     m_xOKPB->set_sensitive(!m_xMakeCB->get_active_text().isEmpty() && !m_xTypeED->get_text().isEmpty());
 }
 
-IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyComboHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyComboHdl, weld::ComboBox&, void)
 {
     Modify();
 }
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 7415792f4642..69cddc7c38e8 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -117,13 +117,13 @@ class SwSaveLabelDlg : public weld::GenericDialogController
     SwLabDlg*   m_pLabDialog;
     SwLabRec&   rLabRec;
 
-    std::unique_ptr<weld::ComboBoxText> m_xMakeCB;
+    std::unique_ptr<weld::ComboBox> m_xMakeCB;
     std::unique_ptr<weld::Entry>        m_xTypeED;
     std::unique_ptr<weld::Button>       m_xOKPB;
 
     DECL_LINK(OkHdl, weld::Button&, void);
     DECL_LINK(ModifyEntryHdl, weld::Entry&, void);
-    DECL_LINK(ModifyComboHdl, weld::ComboBoxText&, void);
+    DECL_LINK(ModifyComboHdl, weld::ComboBox&, void);
 
     void Modify();
 
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 8fe65957ee95..a26f1b9a50cd 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -32,23 +32,23 @@ class SwLabPage : public SfxTabPage
     std::unique_ptr<weld::Widget> m_xAddressFrame;
     std::unique_ptr<weld::CheckButton> m_xAddrBox;
     std::unique_ptr<weld::TextView> m_xWritingEdit;
-    std::unique_ptr<weld::ComboBoxText> m_xDatabaseLB;
-    std::unique_ptr<weld::ComboBoxText> m_xTableLB;
+    std::unique_ptr<weld::ComboBox> m_xDatabaseLB;
+    std::unique_ptr<weld::ComboBox> m_xTableLB;
     std::unique_ptr<weld::Button> m_xInsertBT;
-    std::unique_ptr<weld::ComboBoxText> m_xDBFieldLB;
+    std::unique_ptr<weld::ComboBox> m_xDBFieldLB;
     std::unique_ptr<weld::RadioButton> m_xContButton;
     std::unique_ptr<weld::RadioButton> m_xSheetButton;
-    std::unique_ptr<weld::ComboBoxText> m_xMakeBox;
-    std::unique_ptr<weld::ComboBoxText> m_xTypeBox;
-    std::unique_ptr<weld::ComboBoxText> m_xHiddenSortTypeBox;
+    std::unique_ptr<weld::ComboBox> m_xMakeBox;
+    std::unique_ptr<weld::ComboBox> m_xTypeBox;
+    std::unique_ptr<weld::ComboBox> m_xHiddenSortTypeBox;
     std::unique_ptr<weld::Label> m_xFormatInfo;
 
     DECL_LINK(AddrHdl, weld::ToggleButton&, void);
-    DECL_LINK(DatabaseHdl, weld::ComboBoxText&, void );
+    DECL_LINK(DatabaseHdl, weld::ComboBox&, void );
     DECL_LINK(FieldHdl, weld::Button&, void);
     DECL_LINK(PageHdl, weld::ToggleButton&, void);
-    DECL_LINK(MakeHdl, weld::ComboBoxText&, void);
-    DECL_LINK(TypeHdl, weld::ComboBoxText&, void);
+    DECL_LINK(MakeHdl, weld::ComboBox&, void);
+    DECL_LINK(TypeHdl, weld::ComboBox&, void);
 
     void DisplayFormat  ();
     SwLabRec* GetSelectedEntryPos();