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>

16 files changed, 45 insertions, 45 deletions

diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index b75b19609916..da0f99c49b86 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -44,9 +44,9 @@ using namespace com::sun::star;
 
 ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg(weld::Window* pParent)
     : GenericDialogController(pParent, "modules/scalc/ui/selectdatasource.ui", "SelectDataSourceDialog")
-    , m_xLbDatabase(m_xBuilder->weld_combo_box_text("database"))
-    , m_xCbObject(m_xBuilder->weld_combo_box_text("datasource"))
-    , m_xLbType(m_xBuilder->weld_combo_box_text("type"))
+    , m_xLbDatabase(m_xBuilder->weld_combo_box("database"))
+    , m_xCbObject(m_xBuilder->weld_combo_box("datasource"))
+    , m_xLbType(m_xBuilder->weld_combo_box("type"))
 {
     weld::WaitObject aWait(pParent);       // initializing the database service the first time takes a while
 
@@ -102,7 +102,7 @@ void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc )
     rDesc.bNative = ( nSelect == DP_TYPELIST_SQLNAT );
 }
 
-IMPL_LINK_NOARG(ScDataPilotDatabaseDlg, SelectHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(ScDataPilotDatabaseDlg, SelectHdl, weld::ComboBox&, void)
 {
     FillObjects();
 }
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index b51d27bc3849..b8ae9754d056 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -30,7 +30,7 @@ ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(weld::Window* pParent, bool b
     , m_xBtnNamedRange(m_xBuilder->weld_radio_button("namedrange"))
     , m_xBtnDatabase(m_xBuilder->weld_radio_button("database"))
     , m_xBtnExternal(m_xBuilder->weld_radio_button("external"))
-    , m_xLbNamedRange(m_xBuilder->weld_combo_box_text("rangelb"))
+    , m_xLbNamedRange(m_xBuilder->weld_combo_box("rangelb"))
 {
     m_xBtnSelection->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
     m_xBtnNamedRange->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
@@ -92,7 +92,7 @@ IMPL_LINK_NOARG(ScDataPilotSourceTypeDlg, RadioClickHdl, weld::ToggleButton&, vo
 
 ScDataPilotServiceDlg::ScDataPilotServiceDlg(weld::Window* pParent, const std::vector<OUString>& rServices)
     : GenericDialogController(pParent, "modules/scalc/ui/dapiservicedialog.ui", "DapiserviceDialog")
-    , m_xLbService(m_xBuilder->weld_combo_box_text("service"))
+    , m_xLbService(m_xBuilder->weld_combo_box("service"))
     , m_xEdSource(m_xBuilder->weld_entry("source"))
     , m_xEdName(m_xBuilder->weld_entry("name"))
     , m_xEdUser(m_xBuilder->weld_entry("user"))
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx
index 4722fd92c49e..670fb4c04de8 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -15,7 +15,7 @@
 ScSortKeyItem::ScSortKeyItem(weld::Container* pParent)
     : m_xBuilder(Application::CreateBuilder(pParent, "modules/scalc/ui/sortkey.ui"))
     , m_xFrame(m_xBuilder->weld_frame("SortKeyFrame", true))
-    , m_xLbSort(m_xBuilder->weld_combo_box_text("sortlb"))
+    , m_xLbSort(m_xBuilder->weld_combo_box("sortlb"))
     , m_xBtnUp(m_xBuilder->weld_radio_button("up"))
     , m_xBtnDown(m_xBuilder->weld_radio_button("down"))
 {
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index c9b488fa2bcb..72f4b3ccd55c 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -424,7 +424,7 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem )
 
 // Handler:
 
-IMPL_LINK( ScTabPageSortFields, SelectHdl, weld::ComboBoxText&, rLb, void )
+IMPL_LINK( ScTabPageSortFields, SelectHdl, weld::ComboBox&, rLb, void )
 {
     OUString aSelEntry = rLb.get_active_text();
     ScSortKeyItems::iterator pIter;
@@ -495,13 +495,13 @@ ScTabPageSortOptions::ScTabPageSortOptions(TabPageParent pParent, const SfxItemS
     , m_xBtnFormats(m_xBuilder->weld_check_button("formats"))
     , m_xBtnNaturalSort(m_xBuilder->weld_check_button("naturalsort"))
     , m_xBtnCopyResult(m_xBuilder->weld_check_button("copyresult"))
-    , m_xLbOutPos(m_xBuilder->weld_combo_box_text("outarealb"))
+    , m_xLbOutPos(m_xBuilder->weld_combo_box("outarealb"))
     , m_xEdOutPos(m_xBuilder->weld_entry("outareaed"))
     , m_xBtnSortUser(m_xBuilder->weld_check_button("sortuser"))
-    , m_xLbSortUser(m_xBuilder->weld_combo_box_text("sortuserlb"))
-    , m_xLbLanguage(new LanguageBox(m_xBuilder->weld_combo_box_text("language")))
+    , m_xLbSortUser(m_xBuilder->weld_combo_box("sortuserlb"))
+    , m_xLbLanguage(new LanguageBox(m_xBuilder->weld_combo_box("language")))
     , m_xFtAlgorithm(m_xBuilder->weld_label("algorithmft"))
-    , m_xLbAlgorithm(m_xBuilder->weld_combo_box_text("algorithmlb"))
+    , m_xLbAlgorithm(m_xBuilder->weld_combo_box("algorithmlb"))
     , m_xBtnTopDown(m_xBuilder->weld_radio_button("topdown"))
     , m_xBtnLeftRight(m_xBuilder->weld_radio_button("leftright"))
     , m_xBtnIncComments(m_xBuilder->weld_check_button("includenotes"))
@@ -826,7 +826,7 @@ IMPL_LINK( ScTabPageSortOptions, EnableHdl, weld::ToggleButton&, rButton, void )
     }
 }
 
-IMPL_LINK(ScTabPageSortOptions, SelOutPosHdl, weld::ComboBoxText&, rLb, void)
+IMPL_LINK(ScTabPageSortOptions, SelOutPosHdl, weld::ComboBox&, rLb, void)
 {
     if (&rLb == m_xLbOutPos.get())
     {
@@ -907,7 +907,7 @@ void ScTabPageSortOptions::FillAlgor()
     m_xLbAlgorithm->thaw();
 }
 
-IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl, weld::ComboBox&, void)
 {
     FillAlgor();
 }
diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx
index f916a834af89..27c30e1e9773 100644
--- a/sc/source/ui/inc/dapidata.hxx
+++ b/sc/source/ui/inc/dapidata.hxx
@@ -27,13 +27,13 @@ struct ScImportSourceDesc;
 class ScDataPilotDatabaseDlg : public weld::GenericDialogController
 {
 private:
-    std::unique_ptr<weld::ComboBoxText> m_xLbDatabase;
-    std::unique_ptr<weld::ComboBoxText> m_xCbObject;
-    std::unique_ptr<weld::ComboBoxText> m_xLbType;
+    std::unique_ptr<weld::ComboBox> m_xLbDatabase;
+    std::unique_ptr<weld::ComboBox> m_xCbObject;
+    std::unique_ptr<weld::ComboBox> m_xLbType;
 
     void    FillObjects();
 
-    DECL_LINK(SelectHdl, weld::ComboBoxText&, void);
+    DECL_LINK(SelectHdl, weld::ComboBox&, void);
 
 public:
     ScDataPilotDatabaseDlg(weld::Window* pParent);
diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx
index 3c1fa4790d3f..2fea18054c62 100644
--- a/sc/source/ui/inc/dapitype.hxx
+++ b/sc/source/ui/inc/dapitype.hxx
@@ -29,7 +29,7 @@ private:
     std::unique_ptr<weld::RadioButton> m_xBtnNamedRange;
     std::unique_ptr<weld::RadioButton> m_xBtnDatabase;
     std::unique_ptr<weld::RadioButton> m_xBtnExternal;
-    std::unique_ptr<weld::ComboBoxText> m_xLbNamedRange;
+    std::unique_ptr<weld::ComboBox> m_xLbNamedRange;
 
 public:
     ScDataPilotSourceTypeDlg(weld::Window* pParent, bool bEnableExternal);
@@ -47,7 +47,7 @@ private:
 class ScDataPilotServiceDlg : public weld::GenericDialogController
 {
 private:
-    std::unique_ptr<weld::ComboBoxText> m_xLbService;
+    std::unique_ptr<weld::ComboBox> m_xLbService;
     std::unique_ptr<weld::Entry> m_xEdSource;
     std::unique_ptr<weld::Entry> m_xEdName;
     std::unique_ptr<weld::Entry> m_xEdUser;
diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx
index b6b2dd2cbaba..e377b30eda94 100644
--- a/sc/source/ui/inc/datastreamdlg.hxx
+++ b/sc/source/ui/inc/datastreamdlg.hxx
@@ -46,7 +46,7 @@ class DataStreamDlg : public weld::GenericDialogController
 
     DECL_LINK(UpdateClickHdl, weld::ToggleButton&, void);
     DECL_LINK(UpdateHdl, weld::Entry&, void);
-    DECL_LINK(UpdateComboBoxHdl, weld::ComboBoxText&, void);
+    DECL_LINK(UpdateComboBoxHdl, weld::ComboBox&, void);
     DECL_LINK(BrowseHdl, weld::Button&, void);
 
     void UpdateEnable();
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index 564568419d30..222fe52f3b69 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -44,7 +44,7 @@ private:
     std::unique_ptr<weld::Label> m_xFtSeconds;
     std::unique_ptr<weld::Button> m_xBtnOk;
 
-    DECL_LINK(FileHdl, weld::ComboBoxText&, void);
+    DECL_LINK(FileHdl, weld::ComboBox&, void);
     DECL_LINK(BrowseHdl, weld::Button&, void);
     DECL_LINK(RangeHdl, weld::TreeView&, void);
     DECL_LINK(ReloadHdl, weld::Button&, void);
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index 8f1acc65f6d3..6c56de77f2fa 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -61,7 +61,7 @@ private:
 
     std::unique_ptr<weld::RadioButton> m_xBtnMove;
     std::unique_ptr<weld::RadioButton> m_xBtnCopy;
-    std::unique_ptr<weld::ComboBoxText> m_xLbDoc;
+    std::unique_ptr<weld::ComboBox> m_xLbDoc;
     std::unique_ptr<weld::TreeView> m_xLbTable;
     std::unique_ptr<weld::Entry> m_xEdTabName;
     std::unique_ptr<weld::Label> m_xFtWarn;
@@ -73,7 +73,7 @@ private:
     void    Init            ();
     void    InitDocListBox  ();
     DECL_LINK(OkHdl, weld::Button&, void);
-    DECL_LINK(SelHdl, weld::ComboBoxText&, void);
+    DECL_LINK(SelHdl, weld::ComboBox&, void);
     DECL_LINK(CheckBtnHdl, weld::ToggleButton&, void);
     DECL_LINK(CheckNameHdl, weld::Entry&, void);
 };
diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx
index bbcf2f8f5aed..396b3be9376c 100644
--- a/sc/source/ui/inc/sortkeydlg.hxx
+++ b/sc/source/ui/inc/sortkeydlg.hxx
@@ -23,7 +23,7 @@ struct ScSortKeyItem
     std::unique_ptr<weld::Builder> m_xBuilder;
 
     std::unique_ptr<weld::Frame> m_xFrame;
-    std::unique_ptr<weld::ComboBoxText> m_xLbSort;
+    std::unique_ptr<weld::ComboBox> m_xLbSort;
     std::unique_ptr<weld::RadioButton> m_xBtnUp;
     std::unique_ptr<weld::RadioButton> m_xBtnDown;
 
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 469087353e0e..95a7629f7d09 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -90,7 +90,7 @@ private:
     void    SetLastSortKey( sal_uInt16 nItem );
 
     // Handler ------------------------
-    DECL_LINK(SelectHdl, weld::ComboBoxText&, void);
+    DECL_LINK(SelectHdl, weld::ComboBox&, void);
     DECL_LINK(ScrollToEndHdl, Timer*, void);
 };
 
@@ -134,13 +134,13 @@ private:
     std::unique_ptr<weld::CheckButton> m_xBtnFormats;
     std::unique_ptr<weld::CheckButton> m_xBtnNaturalSort;
     std::unique_ptr<weld::CheckButton> m_xBtnCopyResult;
-    std::unique_ptr<weld::ComboBoxText> m_xLbOutPos;
+    std::unique_ptr<weld::ComboBox> m_xLbOutPos;
     std::unique_ptr<weld::Entry> m_xEdOutPos;
     std::unique_ptr<weld::CheckButton> m_xBtnSortUser;
-    std::unique_ptr<weld::ComboBoxText> m_xLbSortUser;
+    std::unique_ptr<weld::ComboBox> m_xLbSortUser;
     std::unique_ptr<LanguageBox> m_xLbLanguage;
     std::unique_ptr<weld::Label> m_xFtAlgorithm;
-    std::unique_ptr<weld::ComboBoxText> m_xLbAlgorithm;
+    std::unique_ptr<weld::ComboBox> m_xLbAlgorithm;
     std::unique_ptr<weld::RadioButton> m_xBtnTopDown;
     std::unique_ptr<weld::RadioButton> m_xBtnLeftRight;
     std::unique_ptr<weld::CheckButton> m_xBtnIncComments;
@@ -152,11 +152,11 @@ private:
 
     // Handler ------------------------
     DECL_LINK( EnableHdl, weld::ToggleButton&, void );
-    DECL_LINK( SelOutPosHdl, weld::ComboBoxText&, void );
+    DECL_LINK( SelOutPosHdl, weld::ComboBox&, void );
     void EdOutPosModHdl();
     DECL_LINK( SortDirHdl, weld::ToggleButton&, void );
     void FillAlgor();
-    DECL_LINK( FillAlgorHdl, weld::ComboBoxText&, void );
+    DECL_LINK( FillAlgorHdl, weld::ComboBox&, void );
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_TPSORT_HXX
diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index 01c76e994173..985c389fb2b6 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -20,7 +20,7 @@ namespace sc {
 DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, weld::Window* pParent)
     : GenericDialogController(pParent, "modules/scalc/ui/datastreams.ui", "DataStreamDialog")
     , m_pDocShell(pDocShell)
-    , m_xCbUrl(new URLBox(m_xBuilder->weld_combo_box_text("url")))
+    , m_xCbUrl(new URLBox(m_xBuilder->weld_combo_box("url")))
     , m_xBtnBrowse(m_xBuilder->weld_button("browse"))
     , m_xRBValuesInLine(m_xBuilder->weld_radio_button("valuesinline"))
     , m_xRBAddressValue(m_xBuilder->weld_radio_button("addressvalue"))
@@ -65,7 +65,7 @@ IMPL_LINK_NOARG(DataStreamDlg, UpdateClickHdl, weld::ToggleButton&, void)
     UpdateEnable();
 }
 
-IMPL_LINK_NOARG(DataStreamDlg, UpdateComboBoxHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(DataStreamDlg, UpdateComboBoxHdl, weld::ComboBox&, void)
 {
     UpdateEnable();
 }
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index d0909c63f34b..62890a86aab8 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -38,7 +38,7 @@
 ScLinkedAreaDlg::ScLinkedAreaDlg(weld::Window* pParent)
     : GenericDialogController(pParent, "modules/scalc/ui/externaldata.ui", "ExternalDataDialog")
     , m_pSourceShell(nullptr)
-    , m_xCbUrl(new URLBox(m_xBuilder->weld_combo_box_text("url")))
+    , m_xCbUrl(new URLBox(m_xBuilder->weld_combo_box("url")))
     , m_xBtnBrowse(m_xBuilder->weld_button("browse"))
     , m_xLbRanges(m_xBuilder->weld_tree_view("ranges"))
     , m_xBtnReload(m_xBuilder->weld_check_button("reload"))
@@ -70,7 +70,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl, weld::Button&, void)
     m_xDocInserter->StartExecuteModal( LINK( this, ScLinkedAreaDlg, DialogClosedHdl ) );
 }
 
-IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl, weld::ComboBox&, void)
 {
     OUString aEntered = m_xCbUrl->GetURL();
     if (m_pSourceShell)
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 8515f07121de..9052f5dad7fe 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -37,7 +37,7 @@ ScMoveTableDlg::ScMoveTableDlg(weld::Window* pParent, const OUString& rDefault)
     , mbEverEdited(false)
     , m_xBtnMove(m_xBuilder->weld_radio_button("move"))
     , m_xBtnCopy(m_xBuilder->weld_radio_button("copy"))
-    , m_xLbDoc(m_xBuilder->weld_combo_box_text("toDocument"))
+    , m_xLbDoc(m_xBuilder->weld_combo_box("toDocument"))
     , m_xLbTable(m_xBuilder->weld_tree_view("insertBefore"))
     , m_xEdTabName(m_xBuilder->weld_entry("newName"))
     , m_xFtWarn(m_xBuilder->weld_label("newNameWarn"))
@@ -273,7 +273,7 @@ IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl, weld::Button&, void)
     m_xDialog->response(RET_OK);
 }
 
-IMPL_LINK_NOARG(ScMoveTableDlg, SelHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(ScMoveTableDlg, SelHdl, weld::ComboBox&, void)
 {
     ScDocument* pDoc = GetSelectedDoc();
     OUString aName;
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index ba7c93f6161d..cfbc5ee29efa 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -77,9 +77,9 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(weld::Window* pParent, const ScCalcConf
     , mbSelectedEmptyStringAsZero(rConfig.mbEmptyStringAsZero)
     , mbWriteConfig(bWriteConfig)
     , mxEmptyAsZero(m_xBuilder->weld_check_button("checkEmptyAsZero"))
-    , mxConversion(m_xBuilder->weld_combo_box_text("comboConversion"))
+    , mxConversion(m_xBuilder->weld_combo_box("comboConversion"))
     , mxCurrentDocOnly(m_xBuilder->weld_check_button("current_doc"))
-    , mxSyntax(m_xBuilder->weld_combo_box_text("comboSyntaxRef"))
+    , mxSyntax(m_xBuilder->weld_combo_box("comboSyntaxRef"))
 {
     mxConversion->set_active(static_cast<int>(rConfig.meStringConversion));
     mxConversion->connect_changed(LINK(this, ScCalcOptionsDialog, ConversionModifiedHdl));
@@ -128,13 +128,13 @@ IMPL_LINK(ScCalcOptionsDialog, AsZeroModifiedHdl, weld::ToggleButton&, rCheckBox
     maConfig.mbEmptyStringAsZero = mbSelectedEmptyStringAsZero = rCheckBox.get_active();
 }
 
-IMPL_LINK(ScCalcOptionsDialog, ConversionModifiedHdl, weld::ComboBoxText&, rConv, void)
+IMPL_LINK(ScCalcOptionsDialog, ConversionModifiedHdl, weld::ComboBox&, rConv, void)
 {
     maConfig.meStringConversion = static_cast<ScCalcConfig::StringConversion>(rConv.get_active());
     CoupleEmptyAsZeroToStringConversion();
 }
 
-IMPL_LINK(ScCalcOptionsDialog, SyntaxModifiedHdl, weld::ComboBoxText&, rSyntax, void)
+IMPL_LINK(ScCalcOptionsDialog, SyntaxModifiedHdl, weld::ComboBox&, rSyntax, void)
 {
     maConfig.SetStringRefSyntax(toAddressConvention(rSyntax.get_active()));
 }
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 899f04305c9c..8d455797667d 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -26,8 +26,8 @@ public:
     virtual ~ScCalcOptionsDialog() override;
 
     DECL_LINK(AsZeroModifiedHdl, weld::ToggleButton&, void);
-    DECL_LINK(ConversionModifiedHdl, weld::ComboBoxText&, void);
-    DECL_LINK(SyntaxModifiedHdl, weld::ComboBoxText&, void);
+    DECL_LINK(ConversionModifiedHdl, weld::ComboBox&, void);
+    DECL_LINK(SyntaxModifiedHdl, weld::ComboBox&, void);
     DECL_LINK(CurrentDocOnlyHdl, weld::ToggleButton&, void);
 
     const ScCalcConfig& GetConfig() const { return maConfig;}
@@ -42,9 +42,9 @@ private:
     bool mbWriteConfig;
 
     std::unique_ptr<weld::CheckButton> mxEmptyAsZero;
-    std::unique_ptr<weld::ComboBoxText> mxConversion;
+    std::unique_ptr<weld::ComboBox> mxConversion;
     std::unique_ptr<weld::CheckButton> mxCurrentDocOnly;
-    std::unique_ptr<weld::ComboBoxText> mxSyntax;
+    std::unique_ptr<weld::ComboBox> mxSyntax;
 };
 
 #endif