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>

30 files changed, 120 insertions, 120 deletions

diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index f350262e44ad..9afdb75a9118 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -68,7 +68,7 @@ IMPL_LINK_NOARG(SwBreakDlg, ToggleHdl, weld::ToggleButton&, void)
     CheckEnable();
 }
 
-IMPL_LINK_NOARG(SwBreakDlg, ChangeHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwBreakDlg, ChangeHdl, weld::ComboBox&, void)
 {
     CheckEnable();
 }
@@ -135,7 +135,7 @@ SwBreakDlg::SwBreakDlg(weld::Window *pParent, SwWrtShell &rS)
     , m_xColumnBtn(m_xBuilder->weld_radio_button("columnrb"))
     , m_xPageBtn(m_xBuilder->weld_radio_button("pagerb"))
     , m_xPageCollText(m_xBuilder->weld_label("styleft"))
-    , m_xPageCollBox(m_xBuilder->weld_combo_box_text("stylelb"))
+    , m_xPageCollBox(m_xBuilder->weld_combo_box("stylelb"))
     , m_xPageNumBox(m_xBuilder->weld_check_button("pagenumcb"))
     , m_xPageNumEdit(m_xBuilder->weld_spin_button("pagenumsb"))
     , m_xOkBtn(m_xBuilder->weld_button("ok"))
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index eb31be2c98ae..06b04d1c7921 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -141,11 +141,11 @@ SwCharURLPage::SwCharURLPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
     , m_xTextFT(m_xBuilder->weld_label("textft"))
     , m_xTextED(m_xBuilder->weld_entry("texted"))
     , m_xNameED(m_xBuilder->weld_entry("nameed"))
-    , m_xTargetFrameLB(m_xBuilder->weld_combo_box_text("targetfrmlb"))
+    , m_xTargetFrameLB(m_xBuilder->weld_combo_box("targetfrmlb"))
     , m_xURLPB(m_xBuilder->weld_button("urlpb"))
     , m_xEventPB(m_xBuilder->weld_button("eventpb"))
-    , m_xVisitedLB(m_xBuilder->weld_combo_box_text("visitedlb"))
-    , m_xNotVisitedLB(m_xBuilder->weld_combo_box_text("unvisitedlb"))
+    , m_xVisitedLB(m_xBuilder->weld_combo_box("visitedlb"))
+    , m_xNotVisitedLB(m_xBuilder->weld_combo_box("unvisitedlb"))
     , m_xCharStyleContainer(m_xBuilder->weld_widget("charstyle"))
 {
     const SfxPoolItem* pItem;
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 15de25952958..9395eae6ba55 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -472,7 +472,7 @@ SwDropCapsPage::SwDropCapsPage(TabPageParent pParent, const SfxItemSet &rSet)
     , m_xTextText(m_xBuilder->weld_label("labelTXT_TEXT"))
     , m_xTextEdit(m_xBuilder->weld_entry("entryEDT_TEXT"))
     , m_xTemplateText(m_xBuilder->weld_label("labelTXT_TEMPLATE"))
-    , m_xTemplateBox(m_xBuilder->weld_combo_box_text("comboBOX_TEMPLATE"))
+    , m_xTemplateBox(m_xBuilder->weld_combo_box("comboBOX_TEMPLATE"))
     , m_xPict(new weld::CustomWeld(*m_xBuilder, "drawingareaWN_EXAMPLE", m_aPict))
 {
     m_aPict.SetDropCapsPage(this);
@@ -676,7 +676,7 @@ IMPL_LINK(SwDropCapsPage, MetricValueChangedHdl, weld::MetricSpinButton&, rEdit,
     ModifyEntry(rEdit.get_widget());
 }
 
-IMPL_LINK_NOARG(SwDropCapsPage, SelectHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwDropCapsPage, SelectHdl, weld::ComboBox&, void)
 {
     m_aPict.UpdatePaintSettings();
     bModified = true;
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index fda0958c26a7..f49b4c259c1a 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -48,9 +48,9 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(TabPageParent pParent, const SfxIte
     , bModified(false)
     , bCurNumrule(false)
     , m_xOutlineStartBX(m_xBuilder->weld_widget("boxOUTLINE"))
-    , m_xOutlineLvLB(m_xBuilder->weld_combo_box_text("comboLB_OUTLINE_LEVEL"))
+    , m_xOutlineLvLB(m_xBuilder->weld_combo_box("comboLB_OUTLINE_LEVEL"))
     , m_xNumberStyleBX(m_xBuilder->weld_widget("boxNUMBER_STYLE"))
-    , m_xNumberStyleLB(m_xBuilder->weld_combo_box_text("comboLB_NUMBER_STYLE"))
+    , m_xNumberStyleLB(m_xBuilder->weld_combo_box("comboLB_NUMBER_STYLE"))
     , m_xEditNumStyleBtn(m_xBuilder->weld_button("editnumstyle"))
     , m_xNewStartCB(m_xBuilder->weld_check_button("checkCB_NEW_START"))
     , m_xNewStartBX(m_xBuilder->weld_widget("boxNEW_START"))
@@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SwParagraphNumTabPage, LineCountHdl_Impl, weld::ToggleButton&, v
     m_xRestartBX->set_sensitive(bEnableRestartValue);
 }
 
-IMPL_LINK_NOARG(SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, weld::ComboBox&, void)
 {
     int numSelectPos = m_xNumberStyleLB->get_active();
     if (numSelectPos == 0)
@@ -337,7 +337,7 @@ bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl(
 
 }
 
-IMPL_LINK(SwParagraphNumTabPage, StyleHdl_Impl, weld::ComboBoxText&, rBox, void)
+IMPL_LINK(SwParagraphNumTabPage, StyleHdl_Impl, weld::ComboBox&, rBox, void)
 {
     bool bEnable = bCurNumrule || rBox.get_active() > 0;
     m_xNewStartCB->set_sensitive(bEnable);
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index f5fb5f122bc4..2f5b5329ed81 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -220,7 +220,7 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
         }
 
         static_cast<SwParagraphNumTabPage&>(rPage).EnableNewStart();
-        weld::ComboBoxText& rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox();
+        weld::ComboBox& rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox();
         SfxStyleSheetBasePool* pPool = rView.GetDocShell()->GetStyleSheetPool();
         pPool->SetSearchMask(SfxStyleFamily::Pseudo);
         const SfxStyleSheetBase* pBase = pPool->First();
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 6b9e7f86468e..d08a64899854 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -330,7 +330,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(TabPageParent pParent,
     , m_xInMarginsRB(m_xBuilder->weld_radio_button("inmargins"))
     , m_xPrintEmptyPagesCB(m_xBuilder->weld_check_button("blankpages"))
     , m_xPaperFromSetupCB(m_xBuilder->weld_check_button("papertray"))
-    , m_xFaxLB(m_xBuilder->weld_combo_box_text("fax"))
+    , m_xFaxLB(m_xBuilder->weld_combo_box("fax"))
 {
     Link<weld::ToggleButton&,void> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
     m_xGrfCB->connect_toggled( aLk );
@@ -493,7 +493,7 @@ void  SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst )
     m_xFaxLB->set_active(0);
 }
 
-IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, weld::ComboBox&, void)
 {
     bAttrModified=true;
 }
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 2636527176a9..f8a9ed00178c 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -247,7 +247,7 @@ SwMMResultSaveDialog::~SwMMResultSaveDialog()
 SwMMResultPrintDialog::SwMMResultPrintDialog(weld::Window* pParent)
     : GenericDialogController(pParent, "modules/swriter/ui/mmresultprintdialog.ui", "MMResultPrintDialog")
     , m_xPrinterFT(m_xBuilder->weld_label("printerft"))
-    , m_xPrinterLB(m_xBuilder->weld_combo_box_text("printers"))
+    , m_xPrinterLB(m_xBuilder->weld_combo_box("printers"))
     , m_xPrinterSettingsPB(m_xBuilder->weld_button("printersettings"))
     , m_xPrintAllRB(m_xBuilder->weld_radio_button("printallrb"))
     , m_xFromRB(m_xBuilder->weld_radio_button("fromrb"))
@@ -719,7 +719,7 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl, weld::Button&, void)
     m_xDialog->response(RET_OK);
 }
 
-IMPL_LINK(SwMMResultPrintDialog, PrinterChangeHdl_Impl, weld::ComboBoxText&, rBox, void)
+IMPL_LINK(SwMMResultPrintDialog, PrinterChangeHdl_Impl, weld::ComboBox&, rBox, void)
 {
     SwView* pView = ::GetActiveView();
     std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem();
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"))
 {
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();
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 9e7f661872f1..77aa92b22293 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -407,7 +407,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             static_cast<SwParagraphNumTabPage&>(rPage).DisableOutline() ;
             static_cast<SwParagraphNumTabPage&>(rPage).DisableNumbering();
         }//<-end
-        weld::ComboBoxText& rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox();
+        weld::ComboBox& rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox();
         SfxStyleSheetBasePool* pPool = pWrtShell->GetView().GetDocShell()->GetStyleSheetPool();
         pPool->SetSearchMask(SfxStyleFamily::Pseudo);
         const SfxStyleSheetBase* pBase = pPool->First();
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 1332b6040ae4..6aad3e625019 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -163,7 +163,7 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh)
     // create TabPage
     m_pTabPage = static_cast<SwColumnPage*>(SwColumnPage::Create(TabPageParent(m_xContentArea.get(), this), pColPgSet).get());
     m_pTabPage->GetApplyLabel()->show();
-    weld::ComboBoxText* pApplyToLB = m_pTabPage->GetApplyComboBox();
+    weld::ComboBox* pApplyToLB = m_pTabPage->GetApplyComboBox();
     pApplyToLB->show();
 
     if (pCurrSection && (!m_rWrtShell.HasSelection() || 0 != nFullSectCnt))
@@ -212,12 +212,12 @@ SwColumnDlg::~SwColumnDlg()
     m_pTabPage.disposeAndClear();
 }
 
-IMPL_LINK(SwColumnDlg, ObjectListBoxHdl, weld::ComboBoxText&, rBox, void)
+IMPL_LINK(SwColumnDlg, ObjectListBoxHdl, weld::ComboBox&, rBox, void)
 {
     ObjectHdl(&rBox);
 }
 
-void SwColumnDlg::ObjectHdl(const weld::ComboBoxText* pBox)
+void SwColumnDlg::ObjectHdl(const weld::ComboBox* pBox)
 {
     SfxItemSet* pSet = EvalCurrentSelection();
 
@@ -225,7 +225,7 @@ void SwColumnDlg::ObjectHdl(const weld::ComboBoxText* pBox)
     {
         m_pTabPage->FillItemSet(pSet);
     }
-    weld::ComboBoxText* pApplyToLB = m_pTabPage->GetApplyComboBox();
+    weld::ComboBox* pApplyToLB = m_pTabPage->GetApplyComboBox();
     m_nOldSelection = pApplyToLB->get_active_id().toInt32();
     long nWidth = m_nSelectionWidth;
     switch(m_nOldSelection)
@@ -401,9 +401,9 @@ SwColumnPage::SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet)
     , m_xLineHeightLbl(m_xBuilder->weld_label("lineheightft"))
     , m_xLineHeightEdit(m_xBuilder->weld_metric_spin_button("lineheightmf", FUNIT_PERCENT))
     , m_xLinePosLbl(m_xBuilder->weld_label("lineposft"))
-    , m_xLinePosDLB(m_xBuilder->weld_combo_box_text("lineposlb"))
+    , m_xLinePosDLB(m_xBuilder->weld_combo_box("lineposlb"))
     , m_xTextDirectionFT(m_xBuilder->weld_label("textdirectionft"))
-    , m_xTextDirectionLB(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box_text("textdirectionlb")))
+    , m_xTextDirectionLB(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box("textdirectionlb")))
     , m_xLineColorDLB(new ColorListBox(m_xBuilder->weld_menu_button("colorlb"), GetFrameWeld()))
     , m_xLineTypeDLB(new SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb")))
     , m_xEd1(new SwPercentField(m_xBuilder->weld_metric_spin_button("width1mf", FUNIT_CM)))
@@ -415,7 +415,7 @@ SwColumnPage::SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet)
     , m_xPgeExampleWN(new weld::CustomWeld(*m_xBuilder, "pageexample", m_aPgeExampleWN))
     , m_xFrameExampleWN(new weld::CustomWeld(*m_xBuilder, "frameexample", m_aFrameExampleWN))
     , m_xApplyToFT(m_xBuilder->weld_label("applytoft"))
-    , m_xApplyToLB(m_xBuilder->weld_combo_box_text("applytolb"))
+    , m_xApplyToLB(m_xBuilder->weld_combo_box("applytolb"))
 {
     connectPercentField(*m_xEd1);
     connectPercentField(*m_xEd2);
@@ -632,7 +632,7 @@ bool SwColumnPage::FillItemSet(SfxItemSet *rSet)
 }
 
 // update ColumnManager
-IMPL_LINK_NOARG( SwColumnPage, UpdateColMgrListBox, weld::ComboBoxText&, void )
+IMPL_LINK_NOARG( SwColumnPage, UpdateColMgrListBox, weld::ComboBox&, void )
 {
     UpdateColMgr(*m_xLineWidthEdit);
 }
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index cc42c9a993f3..05c48712e6f6 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -54,14 +54,14 @@ class SwSequenceOptionDialog : public weld::GenericDialogController
     SwView&         m_rView;
     OUString        m_aFieldTypeName;
 
-    std::unique_ptr<weld::ComboBoxText> m_xLbLevel;
+    std::unique_ptr<weld::ComboBox> m_xLbLevel;
     std::unique_ptr<weld::Entry> m_xEdDelim;
 
-    std::unique_ptr<weld::ComboBoxText> m_xLbCharStyle;
+    std::unique_ptr<weld::ComboBox> m_xLbCharStyle;
     std::unique_ptr<weld::CheckButton> m_xApplyBorderAndShadowCB;
 
     //#i61007# order of captions
-    std::unique_ptr<weld::ComboBoxText> m_xLbCaptionOrder;
+    std::unique_ptr<weld::ComboBox> m_xLbCaptionOrder;
 
 public:
     SwSequenceOptionDialog(weld::Window *pParent, SwView &rV, const OUString& rSeqFieldType);
@@ -440,11 +440,11 @@ SwSequenceOptionDialog::SwSequenceOptionDialog(weld::Window *pParent, SwView &rV
     : GenericDialogController(pParent, "modules/swriter/ui/captionoptions.ui", "CaptionOptionsDialog")
     , m_rView(rV)
     , m_aFieldTypeName(rSeqFieldType)
-    , m_xLbLevel(m_xBuilder->weld_combo_box_text("level"))
+    , m_xLbLevel(m_xBuilder->weld_combo_box("level"))
     , m_xEdDelim(m_xBuilder->weld_entry("separator"))
-    , m_xLbCharStyle(m_xBuilder->weld_combo_box_text("style"))
+    , m_xLbCharStyle(m_xBuilder->weld_combo_box("style"))
     , m_xApplyBorderAndShadowCB(m_xBuilder->weld_check_button("border_and_shadow"))
-    , m_xLbCaptionOrder(m_xBuilder->weld_combo_box_text("caption_order"))
+    , m_xLbCaptionOrder(m_xBuilder->weld_combo_box("caption_order"))
 {
     SwWrtShell &rSh = m_rView.GetWrtShell();
 
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index b23705100f41..8a85adf01573 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -70,7 +70,7 @@ class SwMMResultPrintDialog : public weld::GenericDialogController
     VclPtr<Printer>        m_pTempPrinter;
 
     std::unique_ptr<weld::Label>        m_xPrinterFT;
-    std::unique_ptr<weld::ComboBoxText> m_xPrinterLB;
+    std::unique_ptr<weld::ComboBox> m_xPrinterLB;
     std::unique_ptr<weld::Button>       m_xPrinterSettingsPB;
     std::unique_ptr<weld::RadioButton>  m_xPrintAllRB;
     std::unique_ptr<weld::RadioButton>  m_xFromRB;
@@ -79,7 +79,7 @@ class SwMMResultPrintDialog : public weld::GenericDialogController
     std::unique_ptr<weld::SpinButton>   m_xToNF;
     std::unique_ptr<weld::Button>       m_xOKButton;
 
-    DECL_LINK(PrinterChangeHdl_Impl, weld::ComboBoxText&, void );
+    DECL_LINK(PrinterChangeHdl_Impl, weld::ComboBox&, void );
     DECL_LINK(PrintHdl_Impl, weld::Button&, void);
     DECL_LINK(PrinterSetupHdl_Impl, weld::Button&, void );
     DECL_LINK(DocumentSelectionHdl_Impl, weld::ToggleButton&, void);
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index dd0c76f59f7b..77ec50bddfd2 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1008,12 +1008,12 @@ class SwCreateAuthEntryDlg_Impl : public weld::GenericDialogController
     std::unique_ptr<weld::Container> m_xBox;
     std::unique_ptr<weld::Container> m_xLeft;
     std::unique_ptr<weld::Container> m_xRight;
-    std::unique_ptr<weld::ComboBoxText> m_xTypeListBox;
-    std::unique_ptr<weld::ComboBoxText> m_xIdentifierBox;
+    std::unique_ptr<weld::ComboBox> m_xTypeListBox;
+    std::unique_ptr<weld::ComboBox> m_xIdentifierBox;
 
-    DECL_LINK(IdentifierHdl, weld::ComboBoxText&, void);
+    DECL_LINK(IdentifierHdl, weld::ComboBox&, void);
     DECL_LINK(ShortNameHdl, weld::Entry&, void);
-    DECL_LINK(EnableHdl, weld::ComboBoxText&, void);
+    DECL_LINK(EnableHdl, weld::ComboBox&, void);
 
 public:
     SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
@@ -1515,7 +1515,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
         m_aFixedTexts.back()->show();
         if( AUTH_FIELD_AUTHORITY_TYPE == aCurInfo.nToxField )
         {
-            m_xTypeListBox = m_aBuilders.back()->weld_combo_box_text("listbox");
+            m_xTypeListBox = m_aBuilders.back()->weld_combo_box("listbox");
             if (bLeft)
                 m_aOrigContainers.back()->move(m_xTypeListBox.get(), m_xLeft.get());
             else
@@ -1537,7 +1537,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
         }
         else if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField && !m_bNewEntryMode)
         {
-            m_xIdentifierBox = m_aBuilders.back()->weld_combo_box_text("combobox");
+            m_xIdentifierBox = m_aBuilders.back()->weld_combo_box("combobox");
             if (bLeft)
                 m_aOrigContainers.back()->move(m_xIdentifierBox.get(), m_xLeft.get());
             else
@@ -1624,7 +1624,7 @@ OUString  SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) cons
     return OUString();
 }
 
-IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, weld::ComboBoxText&, rBox, void)
+IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, weld::ComboBox&, rBox, void)
 {
     const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
                                 rWrtSh.GetFieldType(SwFieldIds::TableOfAuthorities, OUString()));
@@ -1660,7 +1660,7 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, weld::Entry&, rEdit, void)
     }
 }
 
-IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, weld::ComboBoxText&, rBox, void)
+IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, weld::ComboBox&, rBox, void)
 {
     m_xOKBT->set_sensitive(m_bNameAllowed && rBox.get_active() != -1);
 };
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 73ebbb95f970..f3693cb6735d 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -72,21 +72,21 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(TabPageParent pParent, bool bEN,
     , pSh(nullptr)
     , bPosDoc(false)
     , bEndNote(bEN)
-    , m_xNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("numberinglb")))
+    , m_xNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("numberinglb")))
     , m_xOffsetLbl(m_xBuilder->weld_label("offset"))
     , m_xOffsetField(m_xBuilder->weld_spin_button("offsetnf"))
-    , m_xNumCountBox(m_xBuilder->weld_combo_box_text("countinglb"))
+    , m_xNumCountBox(m_xBuilder->weld_combo_box("countinglb"))
     , m_xPrefixED(m_xBuilder->weld_entry("prefix"))
     , m_xSuffixED(m_xBuilder->weld_entry("suffix"))
     , m_xPosFT(m_xBuilder->weld_label("pos"))
     , m_xPosPageBox(m_xBuilder->weld_radio_button("pospagecb"))
     , m_xPosChapterBox(m_xBuilder->weld_radio_button("posdoccb"))
     , m_xStylesContainer(m_xBuilder->weld_widget("allstyles"))
-    , m_xParaTemplBox(m_xBuilder->weld_combo_box_text("parastylelb"))
+    , m_xParaTemplBox(m_xBuilder->weld_combo_box("parastylelb"))
     , m_xPageTemplLbl(m_xBuilder->weld_label("pagestyleft"))
-    , m_xPageTemplBox(m_xBuilder->weld_combo_box_text("pagestylelb"))
-    , m_xFootnoteCharAnchorTemplBox(m_xBuilder->weld_combo_box_text("charanchorstylelb"))
-    , m_xFootnoteCharTextTemplBox(m_xBuilder->weld_combo_box_text("charstylelb"))
+    , m_xPageTemplBox(m_xBuilder->weld_combo_box("pagestylelb"))
+    , m_xFootnoteCharAnchorTemplBox(m_xBuilder->weld_combo_box("charanchorstylelb"))
+    , m_xFootnoteCharTextTemplBox(m_xBuilder->weld_combo_box("charstylelb"))
     , m_xContEdit(m_xBuilder->weld_entry("conted"))
     , m_xContFromEdit(m_xBuilder->weld_entry("contfromed"))
 {
@@ -273,7 +273,7 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl, weld::Button&, void)
     m_xPageTemplBox->set_sensitive(false);
 }
 
-IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl, weld::ComboBox&, void)
 {
     bool bEnable = true;
     if (m_xNumCountBox->get_count() - 1 != m_xNumCountBox->get_active())
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index 8c192a620ca7..3a2c396cd8d1 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -38,18 +38,18 @@ class SwEndNoteOptionPage : public SfxTabPage
     std::unique_ptr<SwNumberingTypeListBox> m_xNumViewBox;
     std::unique_ptr<weld::Label> m_xOffsetLbl;
     std::unique_ptr<weld::SpinButton> m_xOffsetField;
-    std::unique_ptr<weld::ComboBoxText> m_xNumCountBox;
+    std::unique_ptr<weld::ComboBox> m_xNumCountBox;
     std::unique_ptr<weld::Entry> m_xPrefixED;
     std::unique_ptr<weld::Entry> m_xSuffixED;
     std::unique_ptr<weld::Label> m_xPosFT;
     std::unique_ptr<weld::RadioButton> m_xPosPageBox;
     std::unique_ptr<weld::RadioButton> m_xPosChapterBox;
     std::unique_ptr<weld::Widget> m_xStylesContainer;
-    std::unique_ptr<weld::ComboBoxText> m_xParaTemplBox;
+    std::unique_ptr<weld::ComboBox> m_xParaTemplBox;
     std::unique_ptr<weld::Label> m_xPageTemplLbl;
-    std::unique_ptr<weld::ComboBoxText> m_xPageTemplBox;
-    std::unique_ptr<weld::ComboBoxText> m_xFootnoteCharAnchorTemplBox;
-    std::unique_ptr<weld::ComboBoxText> m_xFootnoteCharTextTemplBox;
+    std::unique_ptr<weld::ComboBox> m_xPageTemplBox;
+    std::unique_ptr<weld::ComboBox> m_xFootnoteCharAnchorTemplBox;
+    std::unique_ptr<weld::ComboBox> m_xFootnoteCharTextTemplBox;
     std::unique_ptr<weld::Entry> m_xContEdit;
     std::unique_ptr<weld::Entry> m_xContFromEdit;
 
@@ -58,7 +58,7 @@ class SwEndNoteOptionPage : public SfxTabPage
 
     DECL_LINK(PosPageHdl, weld::Button&, void);
     DECL_LINK(PosChapterHdl, weld::Button&, void);
-    DECL_LINK(NumCountHdl, weld::ComboBoxText&, void);
+    DECL_LINK(NumCountHdl, weld::ComboBox&, void);
 
 public:
     SwEndNoteOptionPage(TabPageParent pParent, bool bEndNote, const SfxItemSet &rSet);
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 07f85c6e0585..418ee444d47b 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -72,9 +72,9 @@ SwLineNumberingDlg::SwLineNumberingDlg(const SwView& rVw)
     , m_xDivIntervalNF(m_xBuilder->weld_spin_button("linesspin"))
     , m_xDivRowsFT(m_xBuilder->weld_widget("lines"))
     , m_xNumIntervalNF(m_xBuilder->weld_spin_button("intervalspin"))
-    , m_xCharStyleLB(m_xBuilder->weld_combo_box_text("styledropdown"))
-    , m_xFormatLB(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("formatdropdown")))
-    , m_xPosLB(m_xBuilder->weld_combo_box_text("positiondropdown"))
+    , m_xCharStyleLB(m_xBuilder->weld_combo_box("styledropdown"))
+    , m_xFormatLB(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("formatdropdown")))
+    , m_xPosLB(m_xBuilder->weld_combo_box("positiondropdown"))
     , m_xOffsetMF(m_xBuilder->weld_metric_spin_button("spacingspin", FUNIT_CM))
     , m_xDivisorED(m_xBuilder->weld_entry("textentry"))
     , m_xCountEmptyLinesCB(m_xBuilder->weld_check_button("blanklines"))
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 997ba0f5a4ad..be703641970b 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -74,13 +74,13 @@ SwNumPositionTabPage::SwNumPositionTabPage(TabPageParent pParent, const SfxItemS
     , m_xDistNumFT(m_xBuilder->weld_label("numdist"))
     , m_xDistNumMF(m_xBuilder->weld_metric_spin_button("numdistmf", FUNIT_CM))
     , m_xAlignFT(m_xBuilder->weld_label("numalign"))
-    , m_xAlignLB(m_xBuilder->weld_combo_box_text("numalignlb"))
+    , m_xAlignLB(m_xBuilder->weld_combo_box("numalignlb"))
     , m_xLabelFollowedByFT(m_xBuilder->weld_label("numfollowedby"))
-    , m_xLabelFollowedByLB(m_xBuilder->weld_combo_box_text("numfollowedbylb"))
+    , m_xLabelFollowedByLB(m_xBuilder->weld_combo_box("numfollowedbylb"))
     , m_xListtabFT(m_xBuilder->weld_label("at"))
     , m_xListtabMF(m_xBuilder->weld_metric_spin_button("atmf", FUNIT_CM))
     , m_xAlign2FT(m_xBuilder->weld_label("num2align"))
-    , m_xAlign2LB(m_xBuilder->weld_combo_box_text("num2alignlb"))
+    , m_xAlign2LB(m_xBuilder->weld_combo_box("num2alignlb"))
     , m_xAlignedAtFT(m_xBuilder->weld_label("alignedat"))
     , m_xAlignedAtMF(m_xBuilder->weld_metric_spin_button("alignedatmf", FUNIT_CM))
     , m_xIndentAtFT(m_xBuilder->weld_label("indentat"))
@@ -535,7 +535,7 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
     m_xIndentAtMF->set_unit( eMetric );
 }
 
-IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl, weld::ComboBox&, void)
 {
     sal_uInt16 nMask = 1;
     for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
@@ -700,7 +700,7 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, weld::ToggleButton&, rBox, void )
     bLastRelative = bOn;
 }
 
-IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl, weld::ComboBox&, void)
 {
     // determine value to be set at the chosen list levels
     SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB;
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index ea75b1761586..9c43cab7df68 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -392,9 +392,9 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(TabPageParent pPage,
     , pCollNames(nullptr)
     , nActLevel(1)
     , m_xLevelLB(m_xBuilder->weld_tree_view("level"))
-    , m_xCollBox(m_xBuilder->weld_combo_box_text("style"))
-    , m_xNumberBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("numbering")))
-    , m_xCharFormatLB(m_xBuilder->weld_combo_box_text("charstyle"))
+    , m_xCollBox(m_xBuilder->weld_combo_box("style"))
+    , m_xNumberBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("numbering")))
+    , m_xCharFormatLB(m_xBuilder->weld_combo_box("charstyle"))
     , m_xAllLevelFT(m_xBuilder->weld_label("sublevelsft"))
     , m_xAllLevelNF(m_xBuilder->weld_spin_button("sublevelsnf"))
     , m_xPrefixED(m_xBuilder->weld_entry("prefix"))
@@ -568,7 +568,7 @@ IMPL_LINK(SwOutlineSettingsTabPage, ToggleComplete, weld::SpinButton&, rEdit, vo
     SetModified();
 }
 
-IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, weld::ComboBoxText&, rBox, void )
+IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, weld::ComboBox&, rBox, void )
 {
     sal_uInt8 i;
 
@@ -616,7 +616,7 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CollSelectGetFocus, weld::Widget&, voi
         aSaveCollNames[i] =  pCollNames[i];
 }
 
-IMPL_LINK_NOARG(SwOutlineSettingsTabPage, NumberSelect, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwOutlineSettingsTabPage, NumberSelect, weld::ComboBox&, void)
 {
     sal_uInt16 nMask = 1;
     SvxNumType nNumberType = m_xNumberBox->GetSelectedNumberingType();
@@ -667,7 +667,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, weld::SpinButton&, rEdit, vo
     SetModified();
 }
 
-IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFormatHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFormatHdl, weld::ComboBox&, void)
 {
     OUString sEntry = m_xCharFormatLB->get_active_text();
     sal_uInt16 nMask = 1;
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index c861014e804e..d7e2718141b7 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -111,7 +111,7 @@ SwFootNotePage::SwFootNotePage(TabPageParent pParent, const SfxItemSet &rSet)
     , m_xMaxHeightBtn(m_xBuilder->weld_radio_button("maxheight"))
     , m_xMaxHeightEdit(m_xBuilder->weld_metric_spin_button("maxheightsb", FUNIT_CM))
     , m_xDistEdit(m_xBuilder->weld_metric_spin_button("spacetotext", FUNIT_CM))
-    , m_xLinePosBox(m_xBuilder->weld_combo_box_text("position"))
+    , m_xLinePosBox(m_xBuilder->weld_combo_box("position"))
     , m_xLineTypeBox(new SvtLineListBox(m_xBuilder->weld_menu_button("style")))
     , m_xLineWidthEdit(m_xBuilder->weld_metric_spin_button("thickness", FUNIT_POINT))
     , m_xLineColorBox(new ColorListBox(m_xBuilder->weld_menu_button("color"), GetFrameWeld()))
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 7fa7e238554a..ff53d13a30ed 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -103,17 +103,17 @@ SwSortDlg::SwSortDlg(weld::Window* pParent, SwWrtShell &rShell)
     , m_xColLbl(m_xBuilder->weld_label("column"))
     , m_xKeyCB1(m_xBuilder->weld_check_button("key1"))
     , m_xColEdt1(m_xBuilder->weld_spin_button("colsb1"))
-    , m_xTypDLB1(m_xBuilder->weld_combo_box_text("typelb1"))
+    , m_xTypDLB1(m_xBuilder->weld_combo_box("typelb1"))
     , m_xSortUp1RB(m_xBuilder->weld_radio_button("up1"))
     , m_xSortDn1RB(m_xBuilder->weld_radio_button("down1"))
     , m_xKeyCB2(m_xBuilder->weld_check_button("key2"))
     , m_xColEdt2(m_xBuilder->weld_spin_button("colsb2"))
-    , m_xTypDLB2(m_xBuilder->weld_combo_box_text("typelb2"))
+    , m_xTypDLB2(m_xBuilder->weld_combo_box("typelb2"))
     , m_xSortUp2RB(m_xBuilder->weld_radio_button("up2"))
     , m_xSortDn2RB(m_xBuilder->weld_radio_button("down2"))
     , m_xKeyCB3(m_xBuilder->weld_check_button("key3"))
     , m_xColEdt3(m_xBuilder->weld_spin_button("colsb3"))
-    , m_xTypDLB3(m_xBuilder->weld_combo_box_text("typelb3"))
+    , m_xTypDLB3(m_xBuilder->weld_combo_box("typelb3"))
     , m_xSortUp3RB(m_xBuilder->weld_radio_button("up3"))
     , m_xSortDn3RB(m_xBuilder->weld_radio_button("down3"))
     , m_xColumnRB(m_xBuilder->weld_radio_button("columns"))
@@ -122,7 +122,7 @@ SwSortDlg::SwSortDlg(weld::Window* pParent, SwWrtShell &rShell)
     , m_xDelimFreeRB(m_xBuilder->weld_radio_button("character"))
     , m_xDelimEdt(m_xBuilder->weld_entry("separator"))
     , m_xDelimPB(m_xBuilder->weld_button("delimpb"))
-    , m_xLangLB(new LanguageBox(m_xBuilder->weld_combo_box_text("langlb")))
+    , m_xLangLB(new LanguageBox(m_xBuilder->weld_combo_box("langlb")))
     , m_xCaseCB(m_xBuilder->weld_check_button("matchcase"))
     , aColText(SwResId(STR_COL))
     , aRowText(SwResId(STR_ROW))
@@ -376,12 +376,12 @@ IMPL_LINK( SwSortDlg, CheckHdl, weld::ToggleButton&, rControl, void )
     }
 }
 
-IMPL_LINK( SwSortDlg, LanguageListBoxHdl, weld::ComboBoxText&, rLBox, void )
+IMPL_LINK( SwSortDlg, LanguageListBoxHdl, weld::ComboBox&, rLBox, void )
 {
     LanguageHdl(&rLBox);
 }
 
-void SwSortDlg::LanguageHdl(weld::ComboBoxText const* pLBox)
+void SwSortDlg::LanguageHdl(weld::ComboBox const* pLBox)
 {
     Sequence < OUString > aSeq( GetAppCollator().listCollatorAlgorithms(
                 LanguageTag( m_xLangLB->get_active_id()).getLocale() ));
@@ -390,13 +390,13 @@ void SwSortDlg::LanguageHdl(weld::ComboBoxText const* pLBox)
         m_xColRes.reset(new CollatorResource);
 
     const int nLstBoxCnt = 3;
-    weld::ComboBoxText* aLstArr[ nLstBoxCnt ] = { m_xTypDLB1.get(), m_xTypDLB2.get(), m_xTypDLB3.get() };
+    weld::ComboBox* aLstArr[ nLstBoxCnt ] = { m_xTypDLB1.get(), m_xTypDLB2.get(), m_xTypDLB3.get() };
     sal_uInt16* const aTypeArr[ nLstBoxCnt ] = { &nType1, &nType2, &nType3 };
     OUString aOldStrArr[ nLstBoxCnt ];
 
     for( int n = 0; n < nLstBoxCnt; ++n )
     {
-        weld::ComboBoxText* pL = aLstArr[ n ];
+        weld::ComboBox* pL = aLstArr[ n ];
         OUString sUserData = pL->get_active_id();
         if (!sUserData.isEmpty())
             aOldStrArr[ n ] = sUserData;
@@ -414,7 +414,7 @@ void SwSortDlg::LanguageHdl(weld::ComboBoxText const* pLBox)
 
         for( int n = 0; n < nLstBoxCnt; ++n )
         {
-            weld::ComboBoxText* pL = aLstArr[ n ];
+            weld::ComboBox* pL = aLstArr[ n ];
             pL->append(sAlg, sUINm);
             if (pLBox && sAlg == aOldStrArr[n])
                 pL->set_active_id(sAlg);
@@ -423,7 +423,7 @@ void SwSortDlg::LanguageHdl(weld::ComboBoxText const* pLBox)
 
     for( int n = 0; n < nLstBoxCnt; ++n )
     {
-        weld::ComboBoxText* pL = aLstArr[ n ];
+        weld::ComboBox* pL = aLstArr[ n ];
         if( !pLBox )
             pL->set_active(*aTypeArr[n]);
         else if (pL->get_active() == -1)
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 06d9728cc0c7..f1f3a023d3ea 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -158,7 +158,7 @@ SwTitlePageDlg::SwTitlePageDlg(weld::Window *pParent)
     , m_xRestartNumberingNF(m_xBuilder->weld_spin_button("NF_RESTART_NUMBERING"))
     , m_xSetPageNumberCB(m_xBuilder->weld_check_button("CB_SET_PAGE_NUMBER"))
     , m_xSetPageNumberNF(m_xBuilder->weld_spin_button("NF_SET_PAGE_NUMBER"))
-    , m_xPagePropertiesLB(m_xBuilder->weld_combo_box_text("LB_PAGE_PROPERTIES"))
+    , m_xPagePropertiesLB(m_xBuilder->weld_combo_box("LB_PAGE_PROPERTIES"))
     , m_xPagePropertiesPB(m_xBuilder->weld_button("PB_PAGE_PROPERTIES"))
     , m_xOkPB(m_xBuilder->weld_button("ok"))
 {
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 7be5d0a313c6..8e61980b1dff 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -88,7 +88,7 @@ SwFormatTablePage::SwFormatTablePage(TabPageParent pParent, const SfxItemSet& rS
     , m_xTopMF(m_xBuilder->weld_metric_spin_button("abovemf", FUNIT_CM))
     , m_xBottomFT(m_xBuilder->weld_label("belowft"))
     , m_xBottomMF(m_xBuilder->weld_metric_spin_button("belowmf", FUNIT_CM))
-    , m_xTextDirectionLB(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box_text("textdirection")))
+    , m_xTextDirectionLB(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box("textdirection")))
     , m_xProperties(m_xBuilder->weld_widget("properties"))
 {
     //lock these to initial sizes so they don't change on percent to non percent change
@@ -1196,7 +1196,7 @@ SwTextFlowPage::SwTextFlowPage(TabPageParent pParent, const SfxItemSet& rSet)
     , m_xPgBrkBeforeRB(m_xBuilder->weld_radio_button("before"))
     , m_xPgBrkAfterRB(m_xBuilder->weld_radio_button("after"))
     , m_xPageCollCB(m_xBuilder->weld_check_button("pagestyle"))
-    , m_xPageCollLB(m_xBuilder->weld_combo_box_text("pagestylelb"))
+    , m_xPageCollLB(m_xBuilder->weld_combo_box("pagestylelb"))
     , m_xPageNoCB(m_xBuilder->weld_check_button("pagenoft"))
     , m_xPageNoNF(m_xBuilder->weld_spin_button("pagenonf"))
     , m_xSplitCB(m_xBuilder->weld_check_button("split"))
@@ -1205,8 +1205,8 @@ SwTextFlowPage::SwTextFlowPage(TabPageParent pParent, const SfxItemSet& rSet)
     , m_xHeadLineCB(m_xBuilder->weld_check_button("headline"))
     , m_xRepeatHeaderCombo(m_xBuilder->weld_widget("repeatheader"))
     , m_xRepeatHeaderNF(m_xBuilder->weld_spin_button("repeatheadernf"))
-    , m_xTextDirectionLB(m_xBuilder->weld_combo_box_text("textdirection"))
-    , m_xVertOrientLB(m_xBuilder->weld_combo_box_text("vertorient"))
+    , m_xTextDirectionLB(m_xBuilder->weld_combo_box("textdirection"))
+    , m_xVertOrientLB(m_xBuilder->weld_combo_box("vertorient"))
 {
     m_xPgBrkCB->connect_toggled(LINK(this, SwTextFlowPage, PageBreakHdl_Impl));
     m_xPgBrkBeforeRB->connect_toggled(