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>

17 files changed, 63 insertions, 67 deletions

diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index d63b1a05ed0a..b0ea05e2ee87 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -52,13 +52,13 @@ class SfxManageStyleSheetPage final : public SfxTabPage
     std::unique_ptr<weld::Entry> m_xName;
     std::unique_ptr<weld::CheckButton> m_xAutoCB;
     std::unique_ptr<weld::Label> m_xFollowFt;
-    std::unique_ptr<weld::ComboBoxText> m_xFollowLb;
+    std::unique_ptr<weld::ComboBox> m_xFollowLb;
     std::unique_ptr<weld::Button> m_xEditStyleBtn;
     std::unique_ptr<weld::Label> m_xBaseFt;
-    std::unique_ptr<weld::ComboBoxText>          m_xBaseLb;
+    std::unique_ptr<weld::ComboBox>          m_xBaseLb;
     std::unique_ptr<weld::Button> m_xEditLinkStyleBtn;
     std::unique_ptr<weld::Label> m_xFilterFt;
-    std::unique_ptr<weld::ComboBoxText> m_xFilterLb;
+    std::unique_ptr<weld::ComboBox> m_xFilterLb;
     std::unique_ptr<weld::Label> m_xDescFt;
     std::unique_ptr<weld::Label> m_xNameFt;
 
@@ -67,12 +67,12 @@ friend class SfxStyleDialogController;
 
     DECL_LINK(GetFocusHdl, weld::Widget&, void);
     DECL_LINK(LoseFocusHdl, weld::Widget&, void);
-    DECL_LINK(EditStyleSelectHdl_Impl, weld::ComboBoxText&, void);
+    DECL_LINK(EditStyleSelectHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(EditStyleHdl_Impl, weld::Button&, void);
-    DECL_LINK(EditLinkStyleSelectHdl_Impl, weld::ComboBoxText&, void);
+    DECL_LINK(EditLinkStyleSelectHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(EditLinkStyleHdl_Impl, weld::Button&, void);
 
-    void    UpdateName_Impl(weld::ComboBoxText*, const OUString &rNew);
+    void    UpdateName_Impl(weld::ComboBox*, const OUString &rNew);
     void    SetDescriptionText_Impl();
 
     virtual ~SfxManageStyleSheetPage() override;
diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index 5cd9e24b41e7..8e7489881c47 100644
--- a/include/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
@@ -38,7 +38,7 @@ private:
 
     DECL_DLLPRIVATE_LINK(OKHdl, weld::TreeView&, void);
     DECL_DLLPRIVATE_LINK(OKClickHdl, weld::Button&, void);
-    DECL_DLLPRIVATE_LINK(ModifyHdl, weld::ComboBoxText&, void);
+    DECL_DLLPRIVATE_LINK(ModifyHdl, weld::ComboBox&, void);
 
 public:
     SfxNewStyleDlg(weld::Window* pParent, SfxStyleSheetBasePool&);
diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx
index 55be5d74edb3..df7e1ec2047c 100644
--- a/include/svtools/PlaceEditDialog.hxx
+++ b/include/svtools/PlaceEditDialog.hxx
@@ -41,7 +41,7 @@ private:
 
 public:
     std::unique_ptr<weld::Entry> m_xEDServerName;
-    std::unique_ptr<weld::ComboBoxText> m_xLBServerType;
+    std::unique_ptr<weld::ComboBox> m_xLBServerType;
     std::unique_ptr<weld::Entry> m_xEDUsername;
     std::unique_ptr<weld::Label> m_xFTUsernameLabel;
     std::unique_ptr<weld::Button> m_xBTOk;
@@ -55,7 +55,7 @@ public:
 
     std::unique_ptr<weld::Widget> m_xRepositoryBox;
     std::unique_ptr<weld::Label> m_xFTRepository;
-    std::unique_ptr<weld::ComboBoxText> m_xLBRepository;
+    std::unique_ptr<weld::ComboBox> m_xLBRepository;
 
     std::unique_ptr<weld::Entry> m_xEDShare;
     std::unique_ptr<weld::Label> m_xFTShare;
@@ -96,7 +96,7 @@ private:
     DECL_LINK ( EditHdl, DetailsContainer*, void );
     DECL_LINK ( ModifyHdl, weld::Entry&, void );
     void SelectType(bool bSkipSeparator);
-    DECL_LINK ( SelectTypeHdl, weld::ComboBoxText&, void );
+    DECL_LINK ( SelectTypeHdl, weld::ComboBox&, void );
     DECL_LINK ( EditLabelHdl, weld::Entry&, void );
     DECL_LINK ( EditUsernameHdl, weld::Entry&, void );
 
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index 731e238e69a0..54d930136891 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -124,7 +124,7 @@ class CmisDetailsContainer : public DetailsContainer
     private:
         void selectRepository( );
         DECL_LINK ( RefreshReposHdl, weld::Button&, void );
-        DECL_LINK ( SelectRepoHdl, weld::ComboBoxText&, void );
+        DECL_LINK ( SelectRepoHdl, weld::ComboBox&, void );
 };
 
 #endif
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 5ff94f0558a9..87822fc0a1fc 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -424,13 +424,13 @@ private:
 
 class SVT_DLLPUBLIC SvtFontStyleBox
 {
-    std::unique_ptr<weld::ComboBoxText> m_xComboBox;
+    std::unique_ptr<weld::ComboBox> m_xComboBox;
 public:
-    SvtFontStyleBox(std::unique_ptr<weld::ComboBoxText> p);
+    SvtFontStyleBox(std::unique_ptr<weld::ComboBox> p);
 
     void Fill(const OUString& rName, const FontList* pList);
 
-    void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_xComboBox->connect_changed(rLink); }
+    void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xComboBox->connect_changed(rLink); }
     OUString get_active_text() const { return m_xComboBox->get_active_text(); }
     void set_active_text(const OUString& rText) { m_xComboBox->set_active_text(rText); }
     void append_text(const OUString& rStr) { m_xComboBox->append_text(rStr); }
@@ -512,8 +512,8 @@ class SVT_DLLPUBLIC SvtFontSizeBox
                     bRelative:1,
                     bPtRelative:1,
                     bStdSize:1;
-    Link<weld::ComboBoxText&, void> m_aChangeHdl;
-    std::unique_ptr<weld::ComboBoxText> m_xComboBox;
+    Link<weld::ComboBox&, void> m_aChangeHdl;
+    std::unique_ptr<weld::ComboBox> m_xComboBox;
 
     sal_uInt16 GetDecimalDigits() const { return nDecimalDigits; }
     void SetDecimalDigits(sal_uInt16 nDigits) { nDecimalDigits = nDigits; }
@@ -526,10 +526,10 @@ class SVT_DLLPUBLIC SvtFontSizeBox
 
     OUString format_number(int nValue) const;
 
-    DECL_LINK(ModifyHdl, weld::ComboBoxText&, void);
+    DECL_LINK(ModifyHdl, weld::ComboBox&, void);
     DECL_LINK(ReformatHdl, weld::Widget&, void);
 public:
-    SvtFontSizeBox(std::unique_ptr<weld::ComboBoxText> p);
+    SvtFontSizeBox(std::unique_ptr<weld::ComboBox> p);
 
     void Fill(const FontMetric* pFontMetric, const FontList* pList);
 
@@ -545,7 +545,7 @@ public:
     }
     bool IsPtRelative() const { return bPtRelative; }
 
-    void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_aChangeHdl = rLink; }
+    void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_aChangeHdl = rLink; }
     OUString get_active_text() const { return m_xComboBox->get_active_text(); }
     void set_active_text(const OUString& rText) { m_xComboBox->set_active_text(rText); }
     void set_sensitive(bool bSensitive) { m_xComboBox->set_sensitive(bSensitive); }
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 6cba183eb953..96415f386956 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -102,23 +102,23 @@ class SVT_DLLPUBLIC URLBox
     std::unique_ptr<SvtURLBox_Impl> pImpl;
     bool                            bHistoryDisabled    : 1;
 
-    std::unique_ptr<weld::ComboBoxText> m_xWidget;
+    std::unique_ptr<weld::ComboBox> m_xWidget;
 
     DECL_DLLPRIVATE_LINK(           TryAutoComplete, Timer*, void);
     SVT_DLLPRIVATE void             UpdatePicklistForSmartProtocol_Impl();
-    DECL_DLLPRIVATE_LINK(           ChangedHdl, weld::ComboBoxText&, void);
+    DECL_DLLPRIVATE_LINK(           ChangedHdl, weld::ComboBox&, void);
     DECL_DLLPRIVATE_LINK(           FocusInHdl, weld::Widget&, void);
     DECL_DLLPRIVATE_LINK(           FocusOutHdl, weld::Widget&, void);
     SVT_DLLPRIVATE void             Init();
 
 public:
-    URLBox(std::unique_ptr<weld::ComboBoxText> pWidget);
+    URLBox(std::unique_ptr<weld::ComboBox> pWidget);
     ~URLBox();
 
     void                            SetText(const OUString& rStr) { m_xWidget->set_entry_text(rStr); }
     void                            Clear() { m_xWidget->clear(); }
-    void connect_entry_activate(const Link<weld::ComboBoxText&, void>& rLink) { m_xWidget->connect_entry_activate(rLink); }
-    void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_xWidget->connect_changed(rLink); }
+    void connect_entry_activate(const Link<weld::ComboBox&, void>& rLink) { m_xWidget->connect_entry_activate(rLink); }
+    void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xWidget->connect_changed(rLink); }
     void                            append_text(const OUString& rStr) { m_xWidget->append_text(rStr); }
     OUString                        get_active_text() const { return m_xWidget->get_active_text(); }
     void                            EnableAutocomplete() { m_xWidget->set_entry_completion(true); }
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index f1f5b6c73832..b10c70bc3571 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -30,7 +30,7 @@ class QueueInfo;
 class SVT_DLLPUBLIC PrinterSetupDialog : public weld::GenericDialogController
 {
 private:
-    std::unique_ptr<weld::ComboBoxText>        m_xLbName;
+    std::unique_ptr<weld::ComboBox>        m_xLbName;
     std::unique_ptr<weld::Button>     m_xBtnProperties;
     std::unique_ptr<weld::Button>     m_xBtnOptions;
     std::unique_ptr<weld::Label>      m_xFiStatus;
@@ -44,7 +44,7 @@ private:
     SVT_DLLPRIVATE void         ImplSetInfo();
 
     DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, weld::Button&, void );
-    DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, weld::ComboBoxText&, void );
+    DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, weld::ComboBox&, void );
     DECL_DLLPRIVATE_LINK( ImplGetFocusHdl, weld::Widget&, void );
     DECL_DLLPRIVATE_LINK( ImplStatusHdl, Timer*, void );
     DECL_DLLPRIVATE_LINK( ImplDataChangedHdl, VclSimpleEvent&, void);
@@ -67,12 +67,12 @@ public:
 #define IMPL_PRINTDLG_STATUS_UPDATE     15000
 
 void ImplFillPrnDlgListBox( const Printer* pPrinter,
-                            weld::ComboBoxText* pBox, weld::Button* pPropBtn );
-void ImplFreePrnDlgListBox( weld::ComboBoxText* pBox, bool bClear = true );
-Printer* ImplPrnDlgListBoxSelect( weld::ComboBoxText const * pBox, weld::Button* pPropBtn,
+                            weld::ComboBox* pBox, weld::Button* pPropBtn );
+void ImplFreePrnDlgListBox( weld::ComboBox* pBox, bool bClear = true );
+Printer* ImplPrnDlgListBoxSelect( weld::ComboBox const * pBox, weld::Button* pPropBtn,
                                   Printer const * pPrinter, Printer* pTempPrinter );
 Printer* ImplPrnDlgUpdatePrinter( Printer const * pPrinter, Printer* pTempPrinter );
-void ImplPrnDlgUpdateQueueInfo( weld::ComboBoxText const * pBox, QueueInfo& rInfo );
+void ImplPrnDlgUpdateQueueInfo( weld::ComboBox const * pBox, QueueInfo& rInfo );
 OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo );
 
 #endif // INCLUDED_SVTOOLS_PRNSETUP_HXX
diff --git a/include/svx/SvxNumOptionsTabPageHelper.hxx b/include/svx/SvxNumOptionsTabPageHelper.hxx
index 0b9d5040440b..ada89f794840 100644
--- a/include/svx/SvxNumOptionsTabPageHelper.hxx
+++ b/include/svx/SvxNumOptionsTabPageHelper.hxx
@@ -46,7 +46,7 @@ public:
             restriction.
     */
     static void GetI18nNumbering(ListBox& rFmtLB, sal_uInt16 nDoNotRemove);
-    static void GetI18nNumbering(weld::ComboBoxText& rFmtLB, sal_uInt16 nDoNotRemove);
+    static void GetI18nNumbering(weld::ComboBox& rFmtLB, sal_uInt16 nDoNotRemove);
 };
 
 #endif
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 02f77a979f34..22682a967240 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -124,7 +124,7 @@ private:
     std::unique_ptr<ColorValueSet> mxColorSet;
     std::unique_ptr<ColorValueSet> mxRecentColorSet;
     std::unique_ptr<weld::Container> mxTopLevel;
-    std::unique_ptr<weld::ComboBoxText> mxPaletteListBox;
+    std::unique_ptr<weld::ComboBox> mxPaletteListBox;
     std::unique_ptr<weld::Button> mxButtonAutoColor;
     std::unique_ptr<weld::Button> mxButtonNoneColor;
     std::unique_ptr<weld::Button> mxButtonPicker;
@@ -133,7 +133,7 @@ private:
     std::unique_ptr<weld::CustomWeld> mxRecentColorSetWin;
 
     DECL_LINK(SelectHdl, SvtValueSet*, void);
-    DECL_LINK(SelectPaletteHdl, weld::ComboBoxText&, void);
+    DECL_LINK(SelectPaletteHdl, weld::ComboBox&, void);
     DECL_LINK(AutoColorClickHdl, weld::Button&, void);
     DECL_LINK(OpenPickerClickHdl, weld::Button&, void);
     DECL_LINK(FocusHdl, weld::Widget&, void);
diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx
index ca907aefcede..e9e64a15f443 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -43,7 +43,7 @@ private:
     std::unique_ptr<weld::CheckButton>  m_xReduceResolutionCB;
     std::unique_ptr<weld::SpinButton>   m_xMFNewWidth;
     std::unique_ptr<weld::SpinButton>   m_xMFNewHeight;
-    std::unique_ptr<weld::ComboBoxText> m_xResolutionLB;
+    std::unique_ptr<weld::ComboBox> m_xResolutionLB;
     std::unique_ptr<weld::RadioButton>  m_xLosslessRB;
     std::unique_ptr<weld::RadioButton>  m_xJpegCompRB;
     std::unique_ptr<weld::SpinButton>   m_xCompressionMF;
@@ -51,7 +51,7 @@ private:
     std::unique_ptr<weld::SpinButton>   m_xQualityMF;
     std::unique_ptr<weld::Scale>        m_xQualitySlider;
     std::unique_ptr<weld::Button>       m_xBtnCalculate;
-    std::unique_ptr<weld::ComboBoxText> m_xInterpolationCombo;
+    std::unique_ptr<weld::ComboBox> m_xInterpolationCombo;
 
     SdrGrafObj*     m_xGraphicObj;
     Graphic         m_aGraphic;
@@ -64,12 +64,12 @@ private:
     void Initialize();
 
     DECL_LINK( SlideHdl, weld::Scale&, void );
-    DECL_LINK( NewInterpolationModifiedHdl, weld::ComboBoxText&, void );
+    DECL_LINK( NewInterpolationModifiedHdl, weld::ComboBox&, void );
     DECL_LINK( NewQualityModifiedHdl, weld::Entry&, void );
     DECL_LINK( NewCompressionModifiedHdl, weld::Entry&, void );
     DECL_LINK( NewWidthModifiedHdl, weld::Entry&, void );
     DECL_LINK( NewHeightModifiedHdl, weld::Entry&, void );
-    DECL_LINK( ResolutionModifiedHdl, weld::ComboBoxText&, void );
+    DECL_LINK( ResolutionModifiedHdl, weld::ComboBox&, void );
     DECL_LINK( ToggleCompressionRB, weld::ToggleButton&, void );
     DECL_LINK( ToggleReduceResolutionRB, weld::ToggleButton&, void );
 
diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index 405065199da9..62d374e06a13 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -56,9 +56,9 @@ public:
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFrameDirectionListBox
 {
 private:
-    std::unique_ptr<weld::ComboBoxText> m_xControl;
+    std::unique_ptr<weld::ComboBox> m_xControl;
 public:
-    explicit SvxFrameDirectionListBox(std::unique_ptr<weld::ComboBoxText> pControl)
+    explicit SvxFrameDirectionListBox(std::unique_ptr<weld::ComboBox> pControl)
         : m_xControl(std::move(pControl))
     {
     }
@@ -77,7 +77,7 @@ public:
     {
         m_xControl->append(OUString::number(static_cast<sal_uInt32>(eDirection)), rString);
     }
-    void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_xControl->connect_changed(rLink); }
+    void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); }
 };
 
 /** Wrapper for usage of a FrameDirectionListBox in item connections. */
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index c83ba9609565..56ef1e7129d6 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -203,7 +203,7 @@ public:
 
     SAL_DLLPRIVATE SvStream&    WriteData( SvStream& rOut ) const;
     SAL_DLLPRIVATE SvStream&    ReadData( SvStream& rIn );
-    static void                 InsertAllThemes(weld::ComboBoxText& rListBox);
+    static void                 InsertAllThemes(weld::ComboBox& rListBox);
 
     // for buffering PreviewBitmaps and strings for object and path
     SAL_DLLPRIVATE void GetPreviewBitmapExAndStrings(sal_uInt32 nPos, BitmapEx& rBitmapEx, Size& rSize, OUString& rTitle, OUString& rPath) const;
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 3ce7a3e43554..2dabd4112a24 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -158,8 +158,8 @@ public:
     };
 
 private:
-    std::unique_ptr<weld::ComboBoxText> m_xControl;
-    Link<weld::ComboBoxText&, void> m_aChangeHdl;
+    std::unique_ptr<weld::ComboBox> m_xControl;
+    Link<weld::ComboBox&, void> m_aChangeHdl;
     OUString m_aAllString;
     std::unique_ptr<css::uno::Sequence<sal_Int16>> m_xSpellUsedLang;
     LanguageType m_eSavedLanguage;
@@ -170,9 +170,9 @@ private:
 
     SVX_DLLPRIVATE int ImplTypeToPos(LanguageType eType) const;
     SVX_DLLPRIVATE void ImplClear();
-    DECL_LINK(ChangeHdl, weld::ComboBoxText&, void);
+    DECL_LINK(ChangeHdl, weld::ComboBox&, void);
 public:
-    LanguageBox(std::unique_ptr<weld::ComboBoxText> pControl);
+    LanguageBox(std::unique_ptr<weld::ComboBox> pControl);
     void            SetLanguageList( SvxLanguageListFlags nLangList,
                             bool bHasLangNone, bool bLangNoneIsLangAll = false,
                             bool bCheckSpellAvail = false );
@@ -182,7 +182,7 @@ public:
     EditedAndValid      GetEditedAndValid() const { return m_eEditedAndValid;}
     sal_Int32           SaveEditedAsEntry();
 
-    void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_aChangeHdl = rLink; }
+    void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_aChangeHdl = rLink; }
     void save_active_id() { m_eSavedLanguage = get_active_id(); }
     LanguageType get_saved_active_id() const { return m_eSavedLanguage; }
     bool get_active_id_changed_from_saved() const { return m_eSavedLanguage != get_active_id(); }
diff --git a/include/svx/pagenumberlistbox.hxx b/include/svx/pagenumberlistbox.hxx
index 51cc94e53a81..c469f4e9ced9 100644
--- a/include/svx/pagenumberlistbox.hxx
+++ b/include/svx/pagenumberlistbox.hxx
@@ -37,16 +37,16 @@ public:
 class SVX_DLLPUBLIC SvxPageNumberListBox
 {
 private:
-    std::unique_ptr<weld::ComboBoxText> m_xControl;
+    std::unique_ptr<weld::ComboBox> m_xControl;
 public:
-    SvxPageNumberListBox(std::unique_ptr<weld::ComboBoxText> pControl);
+    SvxPageNumberListBox(std::unique_ptr<weld::ComboBox> pControl);
     int get_count() const { return m_xControl->get_count(); }
     OUString get_id(int pos) const { return m_xControl->get_id(pos); }
     int get_active() const { return m_xControl->get_active(); }
     void set_active(int pos) { m_xControl->set_active(pos); }
     void save_value() { m_xControl->save_value(); }
     bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); }
-    weld::ComboBoxText& get_widget() const { return *m_xControl; }
+    weld::ComboBox& get_widget() const { return *m_xControl; }
 };
 
 #endif
diff --git a/include/svx/papersizelistbox.hxx b/include/svx/papersizelistbox.hxx
index 0ba2de17ccf5..e8a393fc0063 100644
--- a/include/svx/papersizelistbox.hxx
+++ b/include/svx/papersizelistbox.hxx
@@ -46,20 +46,20 @@ public:
 class SVX_DLLPUBLIC SvxPaperSizeListBox
 {
 private:
-    std::unique_ptr<weld::ComboBoxText> m_xControl;
+    std::unique_ptr<weld::ComboBox> m_xControl;
 public:
-    SvxPaperSizeListBox(std::unique_ptr<weld::ComboBoxText> pControl);
+    SvxPaperSizeListBox(std::unique_ptr<weld::ComboBox> pControl);
 
     void FillPaperSizeEntries(PaperSizeApp eApp);
     void SetSelection(Paper eSize);
     Paper GetSelection() const;
 
-    void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_xControl->connect_changed(rLink); }
+    void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); }
     void clear() { m_xControl->clear(); }
     void save_value() { return m_xControl->save_value(); }
     bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); }
 
-    weld::ComboBoxText& get_widget() const { return *m_xControl; }
+    weld::ComboBox& get_widget() const { return *m_xControl; }
 };
 
 #endif
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index 294362cc5f85..4cf66c7c1641 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -92,10 +92,10 @@ public:
 class SVX_DLLPUBLIC TextEncodingBox
 {
 private:
-    std::unique_ptr<weld::ComboBoxText> m_xControl;
+    std::unique_ptr<weld::ComboBox> m_xControl;
 
 public:
-    TextEncodingBox(std::unique_ptr<weld::ComboBoxText> pControl);
+    TextEncodingBox(std::unique_ptr<weld::ComboBox> pControl);
 
     ~TextEncodingBox();
 
@@ -125,7 +125,7 @@ public:
 
     rtl_TextEncoding    GetSelectTextEncoding() const;
 
-    void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_xControl->connect_changed(rLink); }
+    void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); }
 };
 
 
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index b5fac32ca461..1857033f5929 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -243,14 +243,14 @@ public:
     virtual Container* weld_message_area() = 0;
 };
 
-class VCL_DLLPUBLIC ComboBoxText : virtual public Container
+class VCL_DLLPUBLIC ComboBox : virtual public Container
 {
 private:
     OUString m_sSavedValue;
 
 protected:
-    Link<ComboBoxText&, void> m_aChangeHdl;
-    Link<ComboBoxText&, void> m_aEntryActivateHdl;
+    Link<ComboBox&, void> m_aChangeHdl;
+    Link<ComboBox&, void> m_aEntryActivateHdl;
 
     void signal_changed() { m_aChangeHdl.Call(*this); }
 
@@ -288,7 +288,7 @@ public:
     virtual int find_id(const OUString& rId) const = 0;
     void remove_id(const OUString& rId) { remove(find_id(rId)); }
 
-    void connect_changed(const Link<ComboBoxText&, void>& rLink) { m_aChangeHdl = rLink; }
+    void connect_changed(const Link<ComboBox&, void>& rLink) { m_aChangeHdl = rLink; }
 
     //entry related
     virtual bool has_entry() const = 0;
@@ -299,10 +299,7 @@ public:
     virtual bool get_entry_selection_bounds(int& rStartPos, int& rEndPos) = 0;
     virtual void set_entry_completion(bool bEnable) = 0;
 
-    void connect_entry_activate(const Link<ComboBoxText&, void>& rLink)
-    {
-        m_aEntryActivateHdl = rLink;
-    }
+    void connect_entry_activate(const Link<ComboBox&, void>& rLink) { m_aEntryActivateHdl = rLink; }
 
     void save_value() { m_sSavedValue = get_active_text(); }
     OUString const& get_saved_value() const { return m_sSavedValue; }
@@ -599,7 +596,7 @@ public:
 // an entry + treeview pair, where the entry autocompletes from the
 // treeview list, and selecting something in the list sets the
 // entry to that text, i.e. a visually exploded ComboBox
-class VCL_DLLPUBLIC EntryTreeView : virtual public ComboBoxText
+class VCL_DLLPUBLIC EntryTreeView : virtual public ComboBox
 {
 private:
     DECL_DLLPRIVATE_LINK(ClickHdl, weld::TreeView&, void);
@@ -1067,8 +1064,7 @@ public:
     virtual std::unique_ptr<TimeSpinButton>
     weld_time_spin_button(const OString& id, TimeFieldFormat eFormat, bool bTakeOwnership = false)
         = 0;
-    virtual std::unique_ptr<ComboBoxText> weld_combo_box_text(const OString& id,
-                                                              bool bTakeOwnership = false)
+    virtual std::unique_ptr<ComboBox> weld_combo_box(const OString& id, bool bTakeOwnership = false)
         = 0;
     virtual std::unique_ptr<TreeView> weld_tree_view(const OString& id, bool bTakeOwnership = false)
         = 0;