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, 16 insertions, 16 deletions

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 75ac23aed95f..6f1494d9c9d8 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1222,7 +1222,7 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList )
     }
 }
 
-SvtFontStyleBox::SvtFontStyleBox(std::unique_ptr<weld::ComboBoxText> p)
+SvtFontStyleBox::SvtFontStyleBox(std::unique_ptr<weld::ComboBox> p)
     : m_xComboBox(std::move(p))
 {
     //Use the standard texts to get an optimal size and stick to that size.
@@ -1698,7 +1698,7 @@ sal_Int64 FontSizeBox::GetValueFromStringUnit(const OUString& rStr, FieldUnit eO
     return MetricBox::GetValueFromStringUnit( rStr, eOutUnit );
 }
 
-SvtFontSizeBox::SvtFontSizeBox(std::unique_ptr<weld::ComboBoxText> p)
+SvtFontSizeBox::SvtFontSizeBox(std::unique_ptr<weld::ComboBox> p)
     : pFontList(nullptr)
     , nSavedValue(0)
     , nMin(20)
@@ -1735,7 +1735,7 @@ IMPL_LINK_NOARG(SvtFontSizeBox, ReformatHdl, weld::Widget&, void)
     set_value(get_value());
 }
 
-IMPL_LINK(SvtFontSizeBox, ModifyHdl, weld::ComboBoxText&, rBox, void)
+IMPL_LINK(SvtFontSizeBox, ModifyHdl, weld::ComboBox&, rBox, void)
 {
     if (bRelativeMode)
     {
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 25e70761e7d4..cb6586600939 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -2009,7 +2009,7 @@ IMPL_LINK_NOARG(URLBox, TryAutoComplete, Timer *, void)
         m_xWidget->clear();
 }
 
-URLBox::URLBox(std::unique_ptr<weld::ComboBoxText> pWidget)
+URLBox::URLBox(std::unique_ptr<weld::ComboBox> pWidget)
     : bHistoryDisabled(false)
     , m_xWidget(std::move(pWidget))
 {
@@ -2097,7 +2097,7 @@ void URLBox::UpdatePicklistForSmartProtocol_Impl()
     }
 }
 
-IMPL_LINK_NOARG(URLBox, ChangedHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(URLBox, ChangedHdl, weld::ComboBox&, void)
 {
     aChangedIdle.Start(); //launch this to happen on idle after cursor position will have been set
 }
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 06cf1a118062..1dd17fa27bdd 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -24,7 +24,7 @@ PlaceEditDialog::PlaceEditDialog(weld::Window* pParent)
     , m_bLabelChanged( false )
     , m_bShowPassword( true )
     , m_xEDServerName(m_xBuilder->weld_entry("name"))
-    , m_xLBServerType(m_xBuilder->weld_combo_box_text("type"))
+    , m_xLBServerType(m_xBuilder->weld_combo_box("type"))
     , m_xEDUsername(m_xBuilder->weld_entry("login"))
     , m_xFTUsernameLabel(m_xBuilder->weld_label("loginLabel"))
     , m_xBTOk(m_xBuilder->weld_button("ok"))
@@ -38,7 +38,7 @@ PlaceEditDialog::PlaceEditDialog(weld::Window* pParent)
 
     , m_xRepositoryBox(m_xBuilder->weld_widget("RepositoryDetails"))
     , m_xFTRepository(m_xBuilder->weld_label("repositoryLabel"))
-    , m_xLBRepository(m_xBuilder->weld_combo_box_text("repositories"))
+    , m_xLBRepository(m_xBuilder->weld_combo_box("repositories"))
 
     , m_xEDShare(m_xBuilder->weld_entry("share"))
     , m_xFTShare(m_xBuilder->weld_label("shareLabel"))
@@ -76,7 +76,7 @@ PlaceEditDialog::PlaceEditDialog(weld::Window* pParent, const std::shared_ptr<Pl
     , m_bLabelChanged( true )
     , m_bShowPassword( false )
     , m_xEDServerName(m_xBuilder->weld_entry("name"))
-    , m_xLBServerType(m_xBuilder->weld_combo_box_text("type"))
+    , m_xLBServerType(m_xBuilder->weld_combo_box("type"))
     , m_xEDUsername(m_xBuilder->weld_entry("login"))
     , m_xFTUsernameLabel(m_xBuilder->weld_label("loginLabel"))
     , m_xBTOk(m_xBuilder->weld_button("ok"))
@@ -310,7 +310,7 @@ IMPL_LINK_NOARG( PlaceEditDialog, EditUsernameHdl, weld::Entry&, void )
     EditHdl(nullptr);
 }
 
-IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl, weld::ComboBoxText&, void )
+IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl, weld::ComboBox&, void )
 {
     SelectType(false);
 }
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index 7fbc80c3eb0c..fce35b75717b 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -482,7 +482,7 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl, weld::Button&, void  )
     {}
 }
 
-IMPL_LINK_NOARG( CmisDetailsContainer, SelectRepoHdl, weld::ComboBoxText&, void )
+IMPL_LINK_NOARG( CmisDetailsContainer, SelectRepoHdl, weld::ComboBox&, void )
 {
     selectRepository( );
 }
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index c6f4e5a4a3cd..5d415c32645d 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -25,7 +25,7 @@
 #include <sal/log.hxx>
 
 void ImplFillPrnDlgListBox( const Printer* pPrinter,
-                            weld::ComboBoxText* pBox, weld::Button* pPropBtn )
+                            weld::ComboBox* pBox, weld::Button* pPropBtn )
 {
     ImplFreePrnDlgListBox( pBox );
 
@@ -43,14 +43,14 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter,
 }
 
 
-void ImplFreePrnDlgListBox( weld::ComboBoxText* pBox, bool bClear )
+void ImplFreePrnDlgListBox( weld::ComboBox* pBox, bool bClear )
 {
     if ( bClear )
         pBox->clear();
 }
 
 
-Printer* ImplPrnDlgListBoxSelect( const weld::ComboBoxText* pBox, weld::Button* pPropBtn,
+Printer* ImplPrnDlgListBoxSelect( const weld::ComboBox* pBox, weld::Button* pPropBtn,
                                   Printer const * pPrinter, Printer* pTempPrinterIn )
 {
     VclPtr<Printer> pTempPrinter( pTempPrinterIn );
@@ -108,7 +108,7 @@ Printer* ImplPrnDlgUpdatePrinter( Printer const * pPrinter, Printer* pTempPrinte
 }
 
 
-void ImplPrnDlgUpdateQueueInfo( const weld::ComboBoxText* pBox, QueueInfo& rInfo )
+void ImplPrnDlgUpdateQueueInfo( const weld::ComboBox* pBox, QueueInfo& rInfo )
 {
     if ( pBox->get_active() != -1 )
     {
@@ -210,7 +210,7 @@ OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo )
 
 PrinterSetupDialog::PrinterSetupDialog(weld::Window* pParent)
     : GenericDialogController(pParent, "svt/ui/printersetupdialog.ui", "PrinterSetupDialog")
-    , m_xLbName(m_xBuilder->weld_combo_box_text("name"))
+    , m_xLbName(m_xBuilder->weld_combo_box("name"))
     , m_xBtnProperties(m_xBuilder->weld_button("properties"))
     , m_xBtnOptions(m_xBuilder->weld_button("options"))
     , m_xFiStatus(m_xBuilder->weld_label("status"))
@@ -281,7 +281,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl, weld::Button&, void)
     mpTempPrinter->Setup(m_xDialog.get());
 }
 
-IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl, weld::ComboBox&, void)
 {
     mpTempPrinter = ImplPrnDlgListBoxSelect(m_xLbName.get(), m_xBtnProperties.get(),
                                              mpPrinter, mpTempPrinter);