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>

9 files changed, 14 insertions, 14 deletions

diff --git a/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx b/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx
index 8d5ef1950153..cc1d1427efc0 100644
--- a/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx
+++ b/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx
@@ -89,7 +89,7 @@ void SvxNumOptionsTabPageHelper::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 n
     }
 }
 
-void SvxNumOptionsTabPageHelper::GetI18nNumbering(weld::ComboBoxText& rFmtLB, sal_uInt16 nDoNotRemove)
+void SvxNumOptionsTabPageHelper::GetI18nNumbering(weld::ComboBox& rFmtLB, sal_uInt16 nDoNotRemove)
 {
     Reference<XDefaultNumberingProvider> xDefNum = GetNumberingProvider();
     Reference<XNumberingTypeInfo> xInfo(xDefNum, UNO_QUERY);
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 1fe8e3e9bab1..3c68d0f1d5b1 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -85,9 +85,9 @@ void CompressGraphicsDialog::Initialize()
     m_xReduceResolutionCB = m_xBuilder->weld_check_button("checkbox-reduce-resolution");
     m_xMFNewWidth = m_xBuilder->weld_spin_button("spin-new-width");
     m_xMFNewHeight = m_xBuilder->weld_spin_button("spin-new-height");
-    m_xResolutionLB = m_xBuilder->weld_combo_box_text("combo-resolution");
+    m_xResolutionLB = m_xBuilder->weld_combo_box("combo-resolution");
     m_xBtnCalculate = m_xBuilder->weld_button("calculate");
-    m_xInterpolationCombo = m_xBuilder->weld_combo_box_text("interpolation-method-combo");
+    m_xInterpolationCombo = m_xBuilder->weld_combo_box("interpolation-method-combo");
 
     m_xInterpolationCombo->set_active_text("Lanczos");
 
@@ -289,7 +289,7 @@ IMPL_LINK( CompressGraphicsDialog, SlideHdl, weld::Scale&, rScale, void )
     Update();
 }
 
-IMPL_LINK_NOARG( CompressGraphicsDialog, NewInterpolationModifiedHdl, weld::ComboBoxText&, void )
+IMPL_LINK_NOARG( CompressGraphicsDialog, NewInterpolationModifiedHdl, weld::ComboBox&, void )
 {
     Update();
 }
@@ -315,7 +315,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, NewHeightModifiedHdl, weld::Entry&, voi
     Update();
 }
 
-IMPL_LINK_NOARG( CompressGraphicsDialog, ResolutionModifiedHdl, weld::ComboBoxText&, void )
+IMPL_LINK_NOARG( CompressGraphicsDialog, ResolutionModifiedHdl, weld::ComboBox&, void )
 {
     m_dResolution = static_cast<double>(m_xResolutionLB->get_active_text().toInt32());
 
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 4c737d080569..9770f45587ff 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -753,7 +753,7 @@ void LanguageBox::InsertLanguage(const LanguageType nLangType)
         m_xControl->append(OUString::number(static_cast<sal_uInt16>(nLangType)), aStrEntry);
 }
 
-IMPL_LINK(LanguageBox, ChangeHdl, weld::ComboBoxText&, rControl, void)
+IMPL_LINK(LanguageBox, ChangeHdl, weld::ComboBox&, rControl, void)
 {
     if (rControl.has_entry())
     {
@@ -826,7 +826,7 @@ IMPL_LINK(LanguageBox, ChangeHdl, weld::ComboBoxText&, rControl, void)
     m_aChangeHdl.Call(rControl);
 }
 
-LanguageBox::LanguageBox(std::unique_ptr<weld::ComboBoxText> pControl)
+LanguageBox::LanguageBox(std::unique_ptr<weld::ComboBox> pControl)
     : m_xControl(std::move(pControl))
     , m_aAllString(SvxResId(RID_SVXSTR_LANGUAGE_ALL))
     , m_eSavedLanguage(LANGUAGE_DONTKNOW)
diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx
index 1c8b71fee63e..b67a088fd750 100644
--- a/svx/source/dialog/pagenumberlistbox.cxx
+++ b/svx/source/dialog/pagenumberlistbox.cxx
@@ -74,7 +74,7 @@ Size PageNumberListBox::GetOptimalSize() const
     return Size(150, ListBox::GetOptimalSize().Height());
 }
 
-SvxPageNumberListBox::SvxPageNumberListBox(std::unique_ptr<weld::ComboBoxText> pControl)
+SvxPageNumberListBox::SvxPageNumberListBox(std::unique_ptr<weld::ComboBox> pControl)
     : m_xControl(std::move(pControl))
 {
     m_xControl->set_size_request(150, -1);
diff --git a/svx/source/dialog/papersizelistbox.cxx b/svx/source/dialog/papersizelistbox.cxx
index 5e52dc2a07d0..9a5440889af1 100644
--- a/svx/source/dialog/papersizelistbox.cxx
+++ b/svx/source/dialog/papersizelistbox.cxx
@@ -84,7 +84,7 @@ Size PaperSizeListBox::GetOptimalSize() const
     return Size(150, ListBox::GetOptimalSize().Height());
 }
 
-SvxPaperSizeListBox::SvxPaperSizeListBox(std::unique_ptr<weld::ComboBoxText> pControl)
+SvxPaperSizeListBox::SvxPaperSizeListBox(std::unique_ptr<weld::ComboBox> pControl)
     : m_xControl(std::move(pControl))
 {
     m_xControl->set_size_request(150, -1);
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 6e8a7d974119..16b2c1d33c1d 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -224,7 +224,7 @@ void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc )
         SelectEntryPos( nAt );
 }
 
-TextEncodingBox::TextEncodingBox(std::unique_ptr<weld::ComboBoxText> pControl)
+TextEncodingBox::TextEncodingBox(std::unique_ptr<weld::ComboBox> pControl)
     : m_xControl(std::move(pControl))
 {
     m_xControl->make_sorted();
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 5d76624da921..b47f62ce7a54 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3338,7 +3338,7 @@ namespace svxform
         : GenericDialogController(pParent, "svx/ui/addinstancedialog.ui", "AddInstanceDialog")
         , m_xNameED(m_xBuilder->weld_entry("name"))
         , m_xURLFT(m_xBuilder->weld_label("urlft"))
-        , m_xURLED(new URLBox(m_xBuilder->weld_combo_box_text("url")))
+        , m_xURLED(new URLBox(m_xBuilder->weld_combo_box("url")))
         , m_xFilePickerBtn(m_xBuilder->weld_button("browse"))
         , m_xLinkInstanceCB(m_xBuilder->weld_check_button("link"))
         , m_xAltTitle(m_xBuilder->weld_label("alttitle"))
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 9ae7ed92c2a5..293b30342a36 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -187,7 +187,7 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
         aName = rName;
 }
 
-void GalleryTheme::InsertAllThemes(weld::ComboBoxText& rListBox)
+void GalleryTheme::InsertAllThemes(weld::ComboBox& rListBox)
 {
     for (size_t i = 0; i < SAL_N_ELEMENTS(aUnlocalized); ++i)
         rListBox.append_text(OUString::createFromAscii(aUnlocalized[i].second));
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 50f81f4a02b6..e1e1a73cb2c3 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1385,7 +1385,7 @@ ColorWindow::ColorWindow(std::shared_ptr<PaletteManager> const & rPaletteManager
     , mxColorSet(new ColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin")))
     , mxRecentColorSet(new ColorValueSet(nullptr))
     , mxTopLevel(m_xBuilder->weld_container("palette_popup_window"))
-    , mxPaletteListBox(m_xBuilder->weld_combo_box_text("palette_listbox"))
+    , mxPaletteListBox(m_xBuilder->weld_combo_box("palette_listbox"))
     , mxButtonAutoColor(m_xBuilder->weld_button("auto_color_button"))
     , mxButtonNoneColor(m_xBuilder->weld_button("none_color_button"))
     , mxButtonPicker(m_xBuilder->weld_button("color_picker_button"))
@@ -1644,7 +1644,7 @@ IMPL_LINK_NOARG(SvxColorWindow, SelectPaletteHdl, ListBox&, void)
     mpColorSet->layoutToGivenHeight(mpColorSet->GetSizePixel().Height(), mxPaletteManager->GetColorCount());
 }
 
-IMPL_LINK_NOARG(ColorWindow, SelectPaletteHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(ColorWindow, SelectPaletteHdl, weld::ComboBox&, void)
 {
     int nPos = mxPaletteListBox->get_active();
     mxPaletteManager->SetPalette( nPos );