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>

6 files changed, 15 insertions, 15 deletions

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 4987c1a11bce..683264b1daa4 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -51,7 +51,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(weld::Window* pWindow, SdDrawDocument* pA
     , m_xRemoveBtn(m_xBuilder->weld_button("rem_btn"))
     , m_xImagesLst(m_xBuilder->weld_tree_view("images_tree"))
     , m_xImg(new weld::CustomWeld(*m_xBuilder, "preview_img", m_aImg))
-    , m_xInsTypeCombo(m_xBuilder->weld_combo_box_text("opt_combo"))
+    , m_xInsTypeCombo(m_xBuilder->weld_combo_box("opt_combo"))
     , m_xASRCheck(m_xBuilder->weld_check_button("asr_check"))
     , m_xASRCheckCrop(m_xBuilder->weld_check_button("asr_check_crop"))
     , m_xCapCheck(m_xBuilder->weld_check_button("cap_check"))
@@ -644,7 +644,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, weld::TreeView&, void)
     EnableDisableButtons();
 }
 
-IMPL_LINK_NOARG(SdPhotoAlbumDialog, TypeSelectHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SdPhotoAlbumDialog, TypeSelectHdl, weld::ComboBox&, void)
 {
     // Enable "Fill Slide" only for one image
     // If we want to have it for other images too, we need to implement the actual cropping.
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index 2f458555a00f..937edbe8a509 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -58,7 +58,7 @@ private:
     std::unique_ptr<weld::Button> m_xRemoveBtn;
     std::unique_ptr<weld::TreeView> m_xImagesLst;
     std::unique_ptr<weld::CustomWeld> m_xImg;
-    std::unique_ptr<weld::ComboBoxText> m_xInsTypeCombo;
+    std::unique_ptr<weld::ComboBox> m_xInsTypeCombo;
     std::unique_ptr<weld::CheckButton> m_xASRCheck;
     std::unique_ptr<weld::CheckButton> m_xASRCheckCrop;
     std::unique_ptr<weld::CheckButton> m_xCapCheck;
@@ -73,7 +73,7 @@ private:
     DECL_LINK(RemoveHdl, weld::Button&, void);
 
     DECL_LINK(SelectHdl, weld::TreeView&, void);
-    DECL_LINK(TypeSelectHdl, weld::ComboBoxText&, void);
+    DECL_LINK(TypeSelectHdl, weld::ComboBox&, void);
 
     Reference< drawing::XDrawPage > appendNewSlide(AutoLayout aLayout,
         const Reference< drawing::XDrawPages >& xDrawPages);
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index f02d1347f3ad..324429601d33 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -45,8 +45,8 @@ SdModifyFieldDlg::SdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pI
     , m_pField(pInField)
     , m_xRbtFix(m_xBuilder->weld_radio_button("fixedRB"))
     , m_xRbtVar(m_xBuilder->weld_radio_button("varRB"))
-    , m_xLbLanguage(new LanguageBox(m_xBuilder->weld_combo_box_text("languageLB")))
-    , m_xLbFormat(m_xBuilder->weld_combo_box_text("formatLB"))
+    , m_xLbLanguage(new LanguageBox(m_xBuilder->weld_combo_box("languageLB")))
+    , m_xLbFormat(m_xBuilder->weld_combo_box("formatLB"))
 {
     m_xLbLanguage->SetLanguageList( SvxLanguageListFlags::ALL|SvxLanguageListFlags::ONLY_KNOWN, false );
     m_xLbLanguage->connect_changed(LINK(this, SdModifyFieldDlg, LanguageChangeHdl));
@@ -301,7 +301,7 @@ void SdModifyFieldDlg::FillControls()
     m_xLbFormat->save_value();
 }
 
-IMPL_LINK_NOARG(SdModifyFieldDlg, LanguageChangeHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SdModifyFieldDlg, LanguageChangeHdl, weld::ComboBox&, void)
 {
     FillFormatList();
 }
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 16f0becb0266..1c6843de8241 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -43,8 +43,8 @@ SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxI
     , m_xRbtAll(m_xBuilder->weld_radio_button("allslides"))
     , m_xRbtAtDia(m_xBuilder->weld_radio_button("from"))
     , m_xRbtCustomshow(m_xBuilder->weld_radio_button("customslideshow"))
-    , m_xLbDias(m_xBuilder->weld_combo_box_text("from_cb"))
-    , m_xLbCustomshow(m_xBuilder->weld_combo_box_text("customslideshow_cb"))
+    , m_xLbDias(m_xBuilder->weld_combo_box("from_cb"))
+    , m_xLbCustomshow(m_xBuilder->weld_combo_box("customslideshow_cb"))
     , m_xRbtStandard(m_xBuilder->weld_radio_button("default"))
     , m_xRbtWindow(m_xBuilder->weld_radio_button("window"))
     , m_xRbtAuto(m_xBuilder->weld_radio_button("auto"))
@@ -57,7 +57,7 @@ SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxI
     , m_xCbxChangePage(m_xBuilder->weld_check_button("changeslidesbyclick"))
     , m_xCbxAlwaysOnTop(m_xBuilder->weld_check_button("alwaysontop"))
     , m_xFtMonitor(m_xBuilder->weld_label("presdisplay_label"))
-    , m_xLBMonitor(m_xBuilder->weld_combo_box_text("presdisplay_cb"))
+    , m_xLBMonitor(m_xBuilder->weld_combo_box("presdisplay_cb"))
     , m_xMonitor(m_xBuilder->weld_label("monitor_str"))
     , m_xAllMonitors(m_xBuilder->weld_label("allmonitors_str"))
     , m_xMonitorExternal(m_xBuilder->weld_label("externalmonitor_str"))
diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx
index 2fbe43662959..c8bc7c526945 100644
--- a/sd/source/ui/inc/dlgfield.hxx
+++ b/sd/source/ui/inc/dlgfield.hxx
@@ -39,12 +39,12 @@ private:
     std::unique_ptr<weld::RadioButton> m_xRbtFix;
     std::unique_ptr<weld::RadioButton> m_xRbtVar;
     std::unique_ptr<LanguageBox> m_xLbLanguage;
-    std::unique_ptr<weld::ComboBoxText> m_xLbFormat;
+    std::unique_ptr<weld::ComboBox> m_xLbFormat;
 
     void                FillFormatList();
     void                FillControls();
 
-    DECL_LINK(LanguageChangeHdl, weld::ComboBoxText&, void);
+    DECL_LINK(LanguageChangeHdl, weld::ComboBox&, void);
 
 public:
     SdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet);
diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx
index b147b54606d5..990431646b7c 100644
--- a/sd/source/ui/inc/present.hxx
+++ b/sd/source/ui/inc/present.hxx
@@ -38,8 +38,8 @@ private:
     std::unique_ptr<weld::RadioButton> m_xRbtAll;
     std::unique_ptr<weld::RadioButton> m_xRbtAtDia;
     std::unique_ptr<weld::RadioButton> m_xRbtCustomshow;
-    std::unique_ptr<weld::ComboBoxText> m_xLbDias;
-    std::unique_ptr<weld::ComboBoxText> m_xLbCustomshow;
+    std::unique_ptr<weld::ComboBox> m_xLbDias;
+    std::unique_ptr<weld::ComboBox> m_xLbCustomshow;
 
     std::unique_ptr<weld::RadioButton> m_xRbtStandard;
     std::unique_ptr<weld::RadioButton> m_xRbtWindow;
@@ -55,7 +55,7 @@ private:
     std::unique_ptr<weld::CheckButton> m_xCbxAlwaysOnTop;
 
     std::unique_ptr<weld::Label> m_xFtMonitor;
-    std::unique_ptr<weld::ComboBoxText> m_xLBMonitor;
+    std::unique_ptr<weld::ComboBox> m_xLBMonitor;
 
     std::unique_ptr<weld::Label> m_xMonitor;
     std::unique_ptr<weld::Label> m_xAllMonitors;