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>

5 files changed, 23 insertions, 23 deletions

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