[Libreoffice-commits] core.git: chart2/source cui/source filter/source include/sfx2 include/svtools include/svx include/vcl reportdesign/source sc/source sd/source sfx2/source starmath/inc starmath/source svtools/source svx/source sw/inc sw/source vcl/source vcl/unx writerperfect/inc writerperfect/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Sep 17 13:12:16 UTC 2018
chart2/source/controller/dialogs/tp_ChartType.cxx | 8 -
cui/source/customize/cfg.cxx | 2
cui/source/dialogs/FontFeaturesDialog.cxx | 6 -
cui/source/dialogs/cuicharmap.cxx | 10 -
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/inc/FontFeaturesDialog.hxx | 6 -
cui/source/inc/backgrnd.hxx | 2
cui/source/inc/cfg.hxx | 2
cui/source/inc/chardlg.hxx | 30 ++---
cui/source/inc/cuicharmap.hxx | 10 -
cui/source/inc/cuigaldlg.hxx | 2
cui/source/inc/cuitabarea.hxx | 28 ++---
cui/source/inc/labdlg.hxx | 10 -
cui/source/inc/numpages.hxx | 10 -
cui/source/inc/page.hxx | 14 +-
cui/source/inc/paragrph.hxx | 22 +--
cui/source/inc/swpossizetabpage.hxx | 22 +--
cui/source/inc/textanim.hxx | 4
cui/source/options/optdict.cxx | 2
cui/source/tabpages/backgrnd.cxx | 2
cui/source/tabpages/chardlg.cxx | 62 +++++------
cui/source/tabpages/labdlg.cxx | 10 -
cui/source/tabpages/numpages.cxx | 10 -
cui/source/tabpages/page.cxx | 20 +--
cui/source/tabpages/paragrph.cxx | 24 ++--
cui/source/tabpages/swpossizetabpage.cxx | 24 ++--
cui/source/tabpages/textanim.cxx | 4
cui/source/tabpages/tpbitmap.cxx | 10 -
cui/source/tabpages/tpcolor.cxx | 4
cui/source/tabpages/tpgradnt.cxx | 6 -
cui/source/tabpages/tphatch.cxx | 6 -
cui/source/tabpages/tptrans.cxx | 6 -
filter/source/pdf/impdialog.cxx | 6 -
filter/source/pdf/impdialog.hxx | 6 -
filter/source/xsltdialog/xmlfiltertabpagebasic.cxx | 2
filter/source/xsltdialog/xmlfiltertabpagebasic.hxx | 2
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 6 -
include/sfx2/mgetempl.hxx | 12 +-
include/sfx2/newstyle.hxx | 2
include/svtools/PlaceEditDialog.hxx | 6 -
include/svtools/ServerDetailsControls.hxx | 2
include/svtools/ctrlbox.hxx | 16 +-
include/svtools/inettbc.hxx | 10 -
include/svtools/prnsetup.hxx | 12 +-
include/svx/SvxNumOptionsTabPageHelper.hxx | 2
include/svx/colorwindow.hxx | 4
include/svx/compressgraphicdialog.hxx | 8 -
include/svx/frmdirlbox.hxx | 6 -
include/svx/galtheme.hxx | 2
include/svx/langbox.hxx | 10 -
include/svx/pagenumberlistbox.hxx | 6 -
include/svx/papersizelistbox.hxx | 8 -
include/svx/txencbox.hxx | 6 -
include/vcl/weld.hxx | 18 +--
reportdesign/source/ui/dlg/DateTime.cxx | 6 -
reportdesign/source/ui/inc/DateTime.hxx | 4
sc/source/ui/dbgui/dapidata.cxx | 8 -
sc/source/ui/dbgui/dapitype.cxx | 4
sc/source/ui/dbgui/sortkeydlg.cxx | 2
sc/source/ui/dbgui/tpsort.cxx | 14 +-
sc/source/ui/inc/dapidata.hxx | 8 -
sc/source/ui/inc/dapitype.hxx | 4
sc/source/ui/inc/datastreamdlg.hxx | 2
sc/source/ui/inc/linkarea.hxx | 2
sc/source/ui/inc/mvtabdlg.hxx | 4
sc/source/ui/inc/sortkeydlg.hxx | 2
sc/source/ui/inc/tpsort.hxx | 12 +-
sc/source/ui/miscdlgs/datastreamdlg.cxx | 4
sc/source/ui/miscdlgs/linkarea.cxx | 4
sc/source/ui/miscdlgs/mvtabdlg.cxx | 4
sc/source/ui/optdlg/calcoptionsdlg.cxx | 8 -
sc/source/ui/optdlg/calcoptionsdlg.hxx | 8 -
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 4
sd/source/ui/dlg/PhotoAlbumDialog.hxx | 4
sd/source/ui/dlg/dlgfield.cxx | 6 -
sd/source/ui/dlg/present.cxx | 6 -
sd/source/ui/inc/dlgfield.hxx | 4
sd/source/ui/inc/present.hxx | 6 -
sfx2/source/dialog/mgetempl.cxx | 12 +-
sfx2/source/dialog/newstyle.cxx | 2
starmath/inc/dialog.hxx | 42 +++----
starmath/inc/utility.hxx | 6 -
starmath/source/dialog.cxx | 58 +++++-----
starmath/source/utility.cxx | 4
svtools/source/control/ctrlbox.cxx | 6 -
svtools/source/control/inettbc.cxx | 4
svtools/source/dialogs/PlaceEditDialog.cxx | 8 -
svtools/source/dialogs/ServerDetailsControls.cxx | 2
svtools/source/dialogs/prnsetup.cxx | 12 +-
svx/source/dialog/SvxNumOptionsTabPageHelper.cxx | 2
svx/source/dialog/compressgraphicdialog.cxx | 8 -
svx/source/dialog/langbox.cxx | 4
svx/source/dialog/pagenumberlistbox.cxx | 2
svx/source/dialog/papersizelistbox.cxx | 2
svx/source/dialog/txencbox.cxx | 2
svx/source/form/datanavi.cxx | 2
svx/source/gallery2/gallery1.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 4
sw/inc/dbmgr.hxx | 8 -
sw/source/ui/chrdlg/break.cxx | 4
sw/source/ui/chrdlg/chardlg.cxx | 6 -
sw/source/ui/chrdlg/drpcps.cxx | 4
sw/source/ui/chrdlg/numpara.cxx | 8 -
sw/source/ui/chrdlg/pardlg.cxx | 2
sw/source/ui/config/optpage.cxx | 4
sw/source/ui/dbui/mmresultdialogs.cxx | 4
sw/source/ui/dialog/ascfldlg.cxx | 8 -
sw/source/ui/dialog/uiregionsw.cxx | 4
sw/source/ui/envelp/envfmt.cxx | 4
sw/source/ui/envelp/envfmt.hxx | 4
sw/source/ui/envelp/envlop1.cxx | 8 -
sw/source/ui/envelp/label1.cxx | 18 +--
sw/source/ui/envelp/labfmt.cxx | 4
sw/source/ui/envelp/labfmt.hxx | 4
sw/source/ui/envelp/swuilabimp.hxx | 18 +--
sw/source/ui/fmtui/tmpdlg.cxx | 2
sw/source/ui/frmdlg/column.cxx | 16 +-
sw/source/ui/frmdlg/cption.cxx | 12 +-
sw/source/ui/inc/mmresultdialogs.hxx | 4
sw/source/ui/index/swuiidxmrk.cxx | 16 +-
sw/source/ui/misc/docfnote.cxx | 14 +-
sw/source/ui/misc/impfnote.hxx | 12 +-
sw/source/ui/misc/linenum.cxx | 6 -
sw/source/ui/misc/num.cxx | 10 -
sw/source/ui/misc/outline.cxx | 12 +-
sw/source/ui/misc/pgfnote.cxx | 2
sw/source/ui/misc/srtdlg.cxx | 20 +--
sw/source/ui/misc/titlepage.cxx | 2
sw/source/ui/table/tabledlg.cxx | 8 -
sw/source/uibase/dbui/dbmgr.cxx | 6 -
sw/source/uibase/dialog/watermarkdialog.cxx | 2
sw/source/uibase/inc/ascfldlg.hxx | 4
sw/source/uibase/inc/break.hxx | 4
sw/source/uibase/inc/chrdlg.hxx | 6 -
sw/source/uibase/inc/column.hxx | 12 +-
sw/source/uibase/inc/drpcps.hxx | 4
sw/source/uibase/inc/envlop.hxx | 8 -
sw/source/uibase/inc/linenum.hxx | 4
sw/source/uibase/inc/num.hxx | 10 -
sw/source/uibase/inc/numberingtypelistbox.hxx | 6 -
sw/source/uibase/inc/numpara.hxx | 10 -
sw/source/uibase/inc/optpage.hxx | 4
sw/source/uibase/inc/outline.hxx | 10 -
sw/source/uibase/inc/pgfnote.hxx | 2
sw/source/uibase/inc/srtdlg.hxx | 10 -
sw/source/uibase/inc/titlepage.hxx | 2
sw/source/uibase/inc/uitool.hxx | 6 -
sw/source/uibase/inc/watermarkdialog.hxx | 2
sw/source/uibase/misc/numberingtypelistbox.cxx | 2
sw/source/uibase/table/tablepg.hxx | 6 -
sw/source/uibase/utlui/uitool.cxx | 4
vcl/source/app/salvtables.cxx | 116 ++++++++++-----------
vcl/unx/generic/print/prtsetup.cxx | 18 +--
vcl/unx/generic/print/prtsetup.hxx | 18 +--
vcl/unx/gtk3/gtk3gtkinst.cxx | 112 ++++++++++----------
writerperfect/inc/WPFTEncodingDialog.hxx | 2
writerperfect/source/common/WPFTEncodingDialog.cxx | 11 -
writerperfect/source/writer/EPUBExportDialog.cxx | 12 +-
writerperfect/source/writer/EPUBExportDialog.hxx | 12 +-
159 files changed, 756 insertions(+), 763 deletions(-)
New commits:
commit 76c7cabc42a239dbaf9e72122d36fb213e5a3555
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 14 15:07:17 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 17 15:11:47 2018 +0200
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 at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 269753642511..e7ceacf6c43f 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -268,10 +268,10 @@ public:
void fillParameter( ChartTypeParameter& rParameter, bool bSmoothLines );
private:
- DECL_LINK(SplineTypeListBoxHdl, weld::ComboBoxText&, void);
+ DECL_LINK(SplineTypeListBoxHdl, weld::ComboBox&, void);
private:
- std::unique_ptr<weld::ComboBoxText> m_xLB_Spline_Type;
+ std::unique_ptr<weld::ComboBox> m_xLB_Spline_Type;
std::unique_ptr<weld::SpinButton> m_xMF_SplineResolution;
std::unique_ptr<weld::Label> m_xFT_SplineOrder;
std::unique_ptr<weld::SpinButton> m_xMF_SplineOrder;
@@ -282,7 +282,7 @@ const sal_uInt16 B_SPLINE_POS = 1;
SplinePropertiesDialog::SplinePropertiesDialog(weld::Window* pParent)
: GenericDialogController(pParent, "modules/schart/ui/smoothlinesdlg.ui", "SmoothLinesDialog")
- , m_xLB_Spline_Type(m_xBuilder->weld_combo_box_text("SplineTypeComboBox"))
+ , m_xLB_Spline_Type(m_xBuilder->weld_combo_box("SplineTypeComboBox"))
, m_xMF_SplineResolution(m_xBuilder->weld_spin_button("ResolutionSpinbutton"))
, m_xFT_SplineOrder(m_xBuilder->weld_label("PolynomialsLabel"))
, m_xMF_SplineOrder(m_xBuilder->weld_spin_button("PolynomialsSpinButton"))
@@ -327,7 +327,7 @@ void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool
rParameter.nSplineOrder = m_xMF_SplineOrder->get_value();
}
-IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl, weld::ComboBox&, void)
{
m_xFT_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() == B_SPLINE_POS);
m_xMF_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() == B_SPLINE_POS);
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index facdf5e59e3c..1bd2d5d970e6 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2818,7 +2818,7 @@ SvxNewToolbarDialog::SvxNewToolbarDialog(weld::Window* pWindow, const OUString&
: GenericDialogController(pWindow, "cui/ui/newtoolbardialog.ui", "NewToolbarDialog")
, m_xEdtName(m_xBuilder->weld_entry("edit"))
, m_xBtnOK(m_xBuilder->weld_button("ok"))
- , m_xSaveInListBox(m_xBuilder->weld_combo_box_text("savein"))
+ , m_xSaveInListBox(m_xBuilder->weld_combo_box("savein"))
{
m_xEdtName->set_text(rName);
m_xEdtName->select_region(0, -1);
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx
index 67f87b3410aa..fd3d560224c2 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -28,7 +28,7 @@ FontFeaturesDialog::FontFeaturesDialog(weld::Window* pParent, OUString const& rF
FontFeaturesDialog::~FontFeaturesDialog() {}
-static void makeEnumComboBox(weld::ComboBoxText& rNameBox,
+static void makeEnumComboBox(weld::ComboBox& rNameBox,
vcl::font::FeatureDefinition const& rFeatureDefinition)
{
for (vcl::font::FeatureParameter const& rParameter : rFeatureDefinition.getEnumParameters())
@@ -97,7 +97,7 @@ void FontFeaturesDialog::fillGrid(std::vector<vcl::font::Feature> const& rFontFe
aCurrentItem.m_xContainer->set_grid_left_attach(nGridPositionX);
aCurrentItem.m_xContainer->set_grid_top_attach(nGridPositionY);
- Link<weld::ComboBoxText&, void> aComboBoxSelectHandler
+ Link<weld::ComboBox&, void> aComboBoxSelectHandler
= LINK(this, FontFeaturesDialog, ComboBoxSelectedHdl);
Link<weld::ToggleButton&, void> aCheckBoxToggleHandler
= LINK(this, FontFeaturesDialog, CheckBoxToggledHdl);
@@ -150,7 +150,7 @@ IMPL_LINK_NOARG(FontFeaturesDialog, CheckBoxToggledHdl, weld::ToggleButton&, voi
updateFontPreview();
}
-IMPL_LINK_NOARG(FontFeaturesDialog, ComboBoxSelectedHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(FontFeaturesDialog, ComboBoxSelectedHdl, weld::ComboBox&, void)
{
updateFontPreview();
}
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index a0a4455669ed..cdcadbb691af 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -93,9 +93,9 @@ SvxCharacterMap::SvxCharacterMap(weld::Window* pParent, const SfxItemSet* pSet,
, m_aShowChar(m_xVirDev)
, m_xOKBtn(bInsert ? m_xBuilder->weld_button("insert") : m_xBuilder->weld_button("ok"))
, m_xFontText(m_xBuilder->weld_label("fontft"))
- , m_xFontLB(m_xBuilder->weld_combo_box_text("fontlb"))
+ , m_xFontLB(m_xBuilder->weld_combo_box("fontlb"))
, m_xSubsetText(m_xBuilder->weld_label("subsetft"))
- , m_xSubsetLB(m_xBuilder->weld_combo_box_text("subsetlb"))
+ , m_xSubsetLB(m_xBuilder->weld_combo_box("subsetlb"))
, m_xSearchText(m_xBuilder->weld_entry("search"))
, m_xHexCodeText(m_xBuilder->weld_entry("hexvalue"))
, m_xDecimalCodeText(m_xBuilder->weld_entry("decimalvalue"))
@@ -593,7 +593,7 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont )
m_xSubsetLB->set_active(0);
}
-void SvxCharacterMap::fillAllSubsets(weld::ComboBoxText& rListBox)
+void SvxCharacterMap::fillAllSubsets(weld::ComboBox& rListBox)
{
SubsetMap aAll(nullptr);
rListBox.clear();
@@ -634,7 +634,7 @@ void SvxCharacterMap::insertCharToDoc(const OUString& sGlyph)
}
}
-IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl, weld::ComboBox&, void)
{
const sal_uInt32 nFont = m_xFontLB->get_active_id().toUInt32();
aFont = m_xVirDev->GetDevFont(nFont);
@@ -715,7 +715,7 @@ void SvxCharacterMap::setCharName(sal_UCS4 nDecimalValue)
m_xCharName->set_label(OUString::createFromAscii(buffer));
}
-IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl, weld::ComboBox&, void)
{
const sal_Int32 nPos = m_xSubsetLB->get_active();
const Subset* pSubset = reinterpret_cast<const Subset*>(m_xSubsetLB->get_active_id().toUInt64());
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index e842fed7d5c9..18e39c8ae267 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -508,7 +508,7 @@ GalleryIdDialog::GalleryIdDialog(weld::Window* pParent, GalleryTheme* _pThm)
: GenericDialogController(pParent, "cui/ui/gallerythemeiddialog.ui", "GalleryThemeIDDialog")
, m_pThm(_pThm)
, m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xLbResName(m_xBuilder->weld_combo_box_text("entry"))
+ , m_xLbResName(m_xBuilder->weld_combo_box("entry"))
{
m_xLbResName->append_text("!!! No Id !!!");
diff --git a/cui/source/inc/FontFeaturesDialog.hxx b/cui/source/inc/FontFeaturesDialog.hxx
index 0ba23fe6186c..4fe46ca99bb1 100644
--- a/cui/source/inc/FontFeaturesDialog.hxx
+++ b/cui/source/inc/FontFeaturesDialog.hxx
@@ -27,7 +27,7 @@ struct FontFeatureItem
, m_xBuilder(Application::CreateBuilder(pParent, "cui/ui/fontfragment.ui"))
, m_xContainer(m_xBuilder->weld_widget("fontentry"))
, m_xText(m_xBuilder->weld_label("label"))
- , m_xCombo(m_xBuilder->weld_combo_box_text("combo"))
+ , m_xCombo(m_xBuilder->weld_combo_box("combo"))
, m_xCheck(m_xBuilder->weld_check_button("check"))
{
}
@@ -36,7 +36,7 @@ struct FontFeatureItem
std::unique_ptr<weld::Builder> m_xBuilder;
std::unique_ptr<weld::Widget> m_xContainer;
std::unique_ptr<weld::Label> m_xText;
- std::unique_ptr<weld::ComboBoxText> m_xCombo;
+ std::unique_ptr<weld::ComboBox> m_xCombo;
std::unique_ptr<weld::CheckButton> m_xCheck;
};
@@ -57,7 +57,7 @@ private:
void fillGrid(std::vector<vcl::font::Feature> const& rFontFeatures);
- DECL_LINK(ComboBoxSelectedHdl, weld::ComboBoxText&, void);
+ DECL_LINK(ComboBoxSelectedHdl, weld::ComboBox&, void);
DECL_LINK(CheckBoxToggledHdl, weld::ToggleButton&, void);
public:
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 078e78f05297..3fc8009296ff 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -144,7 +144,7 @@ private:
class SvxBkgTabPage : public SvxAreaTabPage
{
- std::unique_ptr<weld::ComboBoxText> m_xTblLBox;
+ std::unique_ptr<weld::ComboBox> m_xTblLBox;
bool bHighlighting : 1;
public:
using SvxAreaTabPage::DeactivatePage;
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index b151dad1433f..ca03dd54c579 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -574,7 +574,7 @@ private:
std::unique_ptr<weld::Entry> m_xEdtName;
std::unique_ptr<weld::Button> m_xBtnOK;
public:
- std::unique_ptr<weld::ComboBoxText> m_xSaveInListBox;
+ std::unique_ptr<weld::ComboBox> m_xSaveInListBox;
SvxNewToolbarDialog(weld::Window* pWindow, const OUString& rName);
virtual ~SvxNewToolbarDialog() override;
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 42f1f7af7f4c..0aa3cd9499f1 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -77,7 +77,7 @@ private:
std::unique_ptr<weld::Widget> m_xWestFrame;
std::unique_ptr<weld::Label> m_xWestFontNameFT;
- std::unique_ptr<weld::ComboBoxText> m_xWestFontNameLB;
+ std::unique_ptr<weld::ComboBox> m_xWestFontNameLB;
std::unique_ptr<weld::Label> m_xWestFontStyleFT;
std::unique_ptr<SvtFontStyleBox> m_xWestFontStyleLB;
std::unique_ptr<weld::Label> m_xWestFontSizeFT;
@@ -89,7 +89,7 @@ private:
std::unique_ptr<weld::Widget> m_xEastFrame;
std::unique_ptr<weld::Label> m_xEastFontNameFT;
- std::unique_ptr<weld::ComboBoxText> m_xEastFontNameLB;
+ std::unique_ptr<weld::ComboBox> m_xEastFontNameLB;
std::unique_ptr<weld::Label> m_xEastFontStyleFT;
std::unique_ptr<SvtFontStyleBox> m_xEastFontStyleLB;
std::unique_ptr<weld::Label> m_xEastFontSizeFT;
@@ -101,7 +101,7 @@ private:
std::unique_ptr<weld::Widget> m_xCTLFrame;
std::unique_ptr<weld::Label> m_xCTLFontNameFT;
- std::unique_ptr<weld::ComboBoxText> m_xCTLFontNameLB;
+ std::unique_ptr<weld::ComboBox> m_xCTLFontNameLB;
std::unique_ptr<weld::Label> m_xCTLFontStyleFT;
std::unique_ptr<SvtFontStyleBox> m_xCTLFontStyleLB;
std::unique_ptr<weld::Label> m_xCTLFontSizeFT;
@@ -139,7 +139,7 @@ private:
DECL_LINK(UpdateHdl_Impl, Timer *, void );
DECL_LINK(FontModifyEditHdl_Impl, weld::Entry&, void);
- DECL_LINK(FontModifyComboBoxHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(FontModifyComboBoxHdl_Impl, weld::ComboBox&, void);
DECL_LINK(FontFeatureButtonClicked, weld::Button&, void);
void FontModifyHdl_Impl(const weld::Widget&);
@@ -188,25 +188,25 @@ private:
std::unique_ptr<weld::Label> m_xFontColorFT;
std::unique_ptr<ColorListBox> m_xFontColorLB;
std::unique_ptr<weld::Label> m_xEffectsFT;
- std::unique_ptr<weld::ComboBoxText> m_xEffectsLB;
+ std::unique_ptr<weld::ComboBox> m_xEffectsLB;
std::unique_ptr<weld::Label> m_xReliefFT;
- std::unique_ptr<weld::ComboBoxText> m_xReliefLB;
+ std::unique_ptr<weld::ComboBox> m_xReliefLB;
std::unique_ptr<weld::CheckButton> m_xOutlineBtn;
std::unique_ptr<weld::CheckButton> m_xShadowBtn;
std::unique_ptr<weld::CheckButton> m_xBlinkingBtn;
std::unique_ptr<weld::CheckButton> m_xHiddenBtn;
- std::unique_ptr<weld::ComboBoxText> m_xOverlineLB;
+ std::unique_ptr<weld::ComboBox> m_xOverlineLB;
std::unique_ptr<weld::Label> m_xOverlineColorFT;
std::unique_ptr<ColorListBox> m_xOverlineColorLB;
- std::unique_ptr<weld::ComboBoxText> m_xStrikeoutLB;
- std::unique_ptr<weld::ComboBoxText> m_xUnderlineLB;
+ std::unique_ptr<weld::ComboBox> m_xStrikeoutLB;
+ std::unique_ptr<weld::ComboBox> m_xUnderlineLB;
std::unique_ptr<weld::Label> m_xUnderlineColorFT;
std::unique_ptr<ColorListBox> m_xUnderlineColorLB;
std::unique_ptr<weld::CheckButton> m_xIndividualWordsBtn;
std::unique_ptr<weld::Label> m_xEmphasisFT;
- std::unique_ptr<weld::ComboBoxText> m_xEmphasisLB;
+ std::unique_ptr<weld::ComboBox> m_xEmphasisLB;
std::unique_ptr<weld::Label> m_xPositionFT;
- std::unique_ptr<weld::ComboBoxText> m_xPositionLB;
+ std::unique_ptr<weld::ComboBox> m_xPositionLB;
std::unique_ptr<weld::Label> m_xA11yWarningFT;
SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet& rSet);
@@ -219,11 +219,11 @@ private:
Color GetPreviewFontColor(const Color& rColor) const;
void EnableNoneFontColor();
- void SelectHdl_Impl(weld::ComboBoxText*);
- DECL_LINK(SelectListBoxHdl_Impl, weld::ComboBoxText&, void);
+ void SelectHdl_Impl(weld::ComboBox*);
+ DECL_LINK(SelectListBoxHdl_Impl, weld::ComboBox&, void);
DECL_LINK(CbClickHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(TristClickHdl_Impl, weld::ToggleButton&, void);
- DECL_LINK(UpdatePreview_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(UpdatePreview_Impl, weld::ComboBox&, void);
DECL_LINK(ColorBoxSelectHdl_Impl, ColorListBox&, void);
public:
@@ -296,7 +296,7 @@ private:
DECL_LINK(RotationHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(AutoPositionHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(FitToLineHdl_Impl, weld::ToggleButton&, void);
- DECL_LINK(KerningSelectHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(KerningSelectHdl_Impl, weld::ComboBox&, void);
DECL_LINK(KerningModifyHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(ValueChangedHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(ScaleWidthModifyHdl_Impl, weld::MetricSpinButton&, void);
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index cd47e7edaf0a..25ecd6d886d8 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -91,9 +91,9 @@ private:
std::unique_ptr<weld::Button> m_xOKBtn;
std::unique_ptr<weld::Label> m_xFontText;
- std::unique_ptr<weld::ComboBoxText> m_xFontLB;
+ std::unique_ptr<weld::ComboBox> m_xFontLB;
std::unique_ptr<weld::Label> m_xSubsetText;
- std::unique_ptr<weld::ComboBoxText> m_xSubsetLB;
+ std::unique_ptr<weld::ComboBox> m_xSubsetLB;
std::unique_ptr<weld::Entry> m_xSearchText;
std::unique_ptr<weld::Entry> m_xHexCodeText;
std::unique_ptr<weld::Entry> m_xDecimalCodeText;
@@ -113,8 +113,8 @@ private:
enum class Radix : sal_Int16 {decimal = 10, hexadecimal=16};
- DECL_LINK(FontSelectHdl, weld::ComboBoxText&, void);
- DECL_LINK(SubsetSelectHdl, weld::ComboBoxText&, void);
+ DECL_LINK(FontSelectHdl, weld::ComboBox&, void);
+ DECL_LINK(SubsetSelectHdl, weld::ComboBox&, void);
DECL_LINK(CharDoubleClickHdl, SvxShowCharSet*,void);
DECL_LINK(CharSelectHdl, SvxShowCharSet*, void);
DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void);
@@ -136,7 +136,7 @@ private:
DECL_LINK(SearchUpdateHdl, weld::Entry&, void);
DECL_LINK(SearchFieldGetFocusHdl, weld::Widget&, void);
- static void fillAllSubsets(weld::ComboBoxText& rListBox);
+ static void fillAllSubsets(weld::ComboBox& rListBox);
void selectCharByCode(Radix radix);
public:
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index d00a30b819c0..4487a9bd23c7 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -182,7 +182,7 @@ class GalleryIdDialog : public weld::GenericDialogController
private:
GalleryTheme* m_pThm;
std::unique_ptr<weld::Button> m_xBtnOk;
- std::unique_ptr<weld::ComboBoxText> m_xLbResName;
+ std::unique_ptr<weld::ComboBox> m_xLbResName;
DECL_LINK(ClickOkHdl, weld::Button&, void);
public:
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 3bdfe064c70f..544e2e52c62c 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -161,7 +161,7 @@ class SvxTransparenceTabPage : public SvxTabPage
// gradient transparency
std::unique_ptr<weld::Widget> m_xGridGradient;
- std::unique_ptr<weld::ComboBoxText> m_xLbTrgrGradientType;
+ std::unique_ptr<weld::ComboBox> m_xLbTrgrGradientType;
std::unique_ptr<weld::Label> m_xFtTrgrCenterX;
std::unique_ptr<weld::MetricSpinButton> m_xMtrTrgrCenterX;
std::unique_ptr<weld::Label> m_xFtTrgrCenterY;
@@ -183,8 +183,8 @@ class SvxTransparenceTabPage : public SvxTabPage
DECL_LINK(ClickTransGradientHdl_Impl, weld::ToggleButton&, void );
DECL_LINK(ModifyTransparentHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(ModifiedTrgrEditHdl_Impl, weld::MetricSpinButton&, void);
- DECL_LINK(ModifiedTrgrListBoxHdl_Impl, weld::ComboBoxText&, void);
- void ModifiedTrgrHdl_Impl(const weld::ComboBoxText*);
+ DECL_LINK(ModifiedTrgrListBoxHdl_Impl, weld::ComboBox&, void);
+ void ModifiedTrgrHdl_Impl(const weld::ComboBox*);
void ActivateLinear(bool bActivate);
void ActivateGradient(bool bActivate);
@@ -377,7 +377,7 @@ private:
SfxItemSet& m_rXFSet;
XRectPreview m_aCtlPreview;
- std::unique_ptr<weld::ComboBoxText> m_xLbGradientType;
+ std::unique_ptr<weld::ComboBox> m_xLbGradientType;
std::unique_ptr<weld::Label> m_xFtCenter;
std::unique_ptr<weld::MetricSpinButton> m_xMtrCenterX;
std::unique_ptr<weld::MetricSpinButton> m_xMtrCenterY;
@@ -407,7 +407,7 @@ private:
DECL_LINK( ModifiedEditHdl_Impl, weld::SpinButton&, void );
DECL_LINK( ModifiedMetricHdl_Impl, weld::MetricSpinButton&, void );
DECL_LINK( ModifiedColorListBoxHdl_Impl, ColorListBox&, void );
- DECL_LINK( ModifiedListBoxHdl_Impl, weld::ComboBoxText&, void );
+ DECL_LINK( ModifiedListBoxHdl_Impl, weld::ComboBox&, void );
DECL_LINK( ChangeAutoStepHdl_Impl, weld::ToggleButton&, void );
DECL_LINK( ModifiedSliderHdl_Impl, weld::Scale&, void );
void ModifiedHdl_Impl(void const *);
@@ -461,7 +461,7 @@ private:
std::unique_ptr<weld::MetricSpinButton> m_xMtrDistance;
std::unique_ptr<weld::MetricSpinButton> m_xMtrAngle;
std::unique_ptr<weld::Scale> m_xSliderAngle;
- std::unique_ptr<weld::ComboBoxText> m_xLbLineType;
+ std::unique_ptr<weld::ComboBox> m_xLbLineType;
std::unique_ptr<ColorListBox> m_xLbLineColor;
std::unique_ptr<weld::CheckButton> m_xCbBackgroundColor;
std::unique_ptr<ColorListBox> m_xLbBackgroundColor;
@@ -474,7 +474,7 @@ private:
DECL_LINK(ChangeHatchHdl, SvtValueSet*, void);
void ChangeHatchHdl_Impl();
DECL_LINK( ModifiedEditHdl_Impl, weld::MetricSpinButton&, void );
- DECL_LINK( ModifiedListBoxHdl_Impl, weld::ComboBoxText&, void );
+ DECL_LINK( ModifiedListBoxHdl_Impl, weld::ComboBox&, void );
DECL_LINK( ModifiedColorListBoxHdl_Impl, ColorListBox&, void );
DECL_LINK( ToggleHatchBackgroundColor_Impl, weld::ToggleButton&, void );
DECL_LINK( ModifiedBackgroundHdl_Impl, ColorListBox&, void );
@@ -543,18 +543,18 @@ private:
XRectPreview m_aCtlBitmapPreview;
std::unique_ptr<PresetListBox> m_xBitmapLB;
- std::unique_ptr<weld::ComboBoxText> m_xBitmapStyleLB;
+ std::unique_ptr<weld::ComboBox> m_xBitmapStyleLB;
std::unique_ptr<weld::Container> m_xSizeBox;
std::unique_ptr<weld::CheckButton> m_xTsbScale;
std::unique_ptr<weld::MetricSpinButton> m_xBitmapWidth;
std::unique_ptr<weld::MetricSpinButton> m_xBitmapHeight;
std::unique_ptr<weld::Container> m_xPositionBox;
- std::unique_ptr<weld::ComboBoxText> m_xPositionLB;
+ std::unique_ptr<weld::ComboBox> m_xPositionLB;
std::unique_ptr<weld::Container> m_xPositionOffBox;
std::unique_ptr<weld::MetricSpinButton> m_xPositionOffX;
std::unique_ptr<weld::MetricSpinButton> m_xPositionOffY;
std::unique_ptr<weld::Container> m_xTileOffBox;
- std::unique_ptr<weld::ComboBoxText> m_xTileOffLB;
+ std::unique_ptr<weld::ComboBox> m_xTileOffLB;
std::unique_ptr<weld::MetricSpinButton> m_xTileOffset;
std::unique_ptr<weld::Button> m_xBtnImport;
std::unique_ptr<weld::CustomWeld> m_xCtlBitmapPreview;
@@ -562,9 +562,9 @@ private:
DECL_LINK( ModifyBitmapHdl, SvtValueSet*, void );
DECL_LINK( ClickScaleHdl, weld::Button&, void );
- DECL_LINK( ModifyBitmapStyleHdl, weld::ComboBoxText&, void );
+ DECL_LINK( ModifyBitmapStyleHdl, weld::ComboBox&, void );
DECL_LINK( ModifyBitmapSizeHdl, weld::MetricSpinButton&, void );
- DECL_LINK( ModifyBitmapPositionHdl, weld::ComboBoxText&, void );
+ DECL_LINK( ModifyBitmapPositionHdl, weld::ComboBox&, void );
DECL_LINK( ModifyPositionOffsetHdl, weld::MetricSpinButton&, void );
DECL_LINK( ModifyTileOffsetHdl, weld::MetricSpinButton&, void );
DECL_LINK( ClickRenameHdl, PresetListBox*, void );
@@ -695,7 +695,7 @@ private:
XRectPreview m_aCtlPreviewNew;
std::unique_ptr<ColorValueSet> m_xValSetColorList;
std::unique_ptr<ColorValueSet> m_xValSetRecentList;
- std::unique_ptr<weld::ComboBoxText> m_xSelectPalette;
+ std::unique_ptr<weld::ComboBox> m_xSelectPalette;
std::unique_ptr<weld::RadioButton> m_xRbRGB;
std::unique_ptr<weld::RadioButton> m_xRbCMYK;
std::unique_ptr<weld::Widget> m_xRGBcustom;
@@ -739,7 +739,7 @@ private:
DECL_LINK(ClickWorkOnHdl_Impl, weld::Button&, void);
DECL_LINK(ClickDeleteHdl_Impl, weld::Button&, void);
- DECL_LINK(SelectPaletteLBHdl, weld::ComboBoxText&, void);
+ DECL_LINK(SelectPaletteLBHdl, weld::ComboBox&, void);
DECL_LINK( SelectValSetHdl_Impl, SvtValueSet*, void );
DECL_LINK( SelectColorModeHdl_Impl, weld::ToggleButton&, void );
void ChangeColor(const Color &rNewColor, bool bUpdatePreset = true);
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 3a9dd48cc98c..da4a9aa2cd3f 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -61,12 +61,12 @@ private:
const SdrView* pView;
std::unique_ptr<weld::MetricSpinButton> m_xMF_SPACING;
- std::unique_ptr<weld::ComboBoxText> m_xLB_EXTENSION;
+ std::unique_ptr<weld::ComboBox> m_xLB_EXTENSION;
std::unique_ptr<weld::Label> m_xFT_BYFT;
std::unique_ptr<weld::MetricSpinButton> m_xMF_BY;
std::unique_ptr<weld::Label> m_xFT_POSITIONFT;
- std::unique_ptr<weld::ComboBoxText> m_xLB_POSITION;
- std::unique_ptr<weld::ComboBoxText> m_xLineTypes;
+ std::unique_ptr<weld::ComboBox> m_xLB_POSITION;
+ std::unique_ptr<weld::ComboBox> m_xLineTypes;
std::unique_ptr<weld::Label> m_xFT_LENGTHFT;
std::unique_ptr<weld::MetricSpinButton> m_xMF_LENGTH;
std::unique_ptr<weld::CheckButton> m_xCB_OPTIMAL;
@@ -75,8 +75,8 @@ private:
void SetupExtension_Impl( sal_uInt16 nType );
void SetupType_Impl( SdrCaptionType nType );
- DECL_LINK(ExtensionSelectHdl_Impl, weld::ComboBoxText&, void);
- DECL_LINK(PositionSelectHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(ExtensionSelectHdl_Impl, weld::ComboBox&, void);
+ DECL_LINK(PositionSelectHdl_Impl, weld::ComboBox&, void);
DECL_LINK(LineOptHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(SelectCaptTypeHdl_Impl, SvtValueSet*, void);
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index d4d3ffb7e8aa..1e2dc214b44b 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -405,15 +405,15 @@ class SvxNumPositionTabPage : public SfxTabPage
std::unique_ptr<weld::Label> m_xDistNumFT;
std::unique_ptr<weld::MetricSpinButton> m_xDistNumMF;
std::unique_ptr<weld::Label> m_xAlignFT;
- std::unique_ptr<weld::ComboBoxText> m_xAlignLB;
+ std::unique_ptr<weld::ComboBox> m_xAlignLB;
// new set of controls shown for numbering rules containing list level
// attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT
std::unique_ptr<weld::Label> m_xLabelFollowedByFT;
- std::unique_ptr<weld::ComboBoxText> m_xLabelFollowedByLB;
+ std::unique_ptr<weld::ComboBox> m_xLabelFollowedByLB;
std::unique_ptr<weld::Label> m_xListtabFT;
std::unique_ptr<weld::MetricSpinButton> m_xListtabMF;
std::unique_ptr<weld::Label>m_xAlign2FT;
- std::unique_ptr<weld::ComboBoxText> m_xAlign2LB;
+ std::unique_ptr<weld::ComboBox> m_xAlign2LB;
std::unique_ptr<weld::Label> m_xAlignedAtFT;
std::unique_ptr<weld::MetricSpinButton> m_xAlignedAtMF;
std::unique_ptr<weld::Label> m_xIndentAtFT;
@@ -424,7 +424,7 @@ class SvxNumPositionTabPage : public SfxTabPage
void InitControls();
DECL_LINK(LevelHdl_Impl, weld::TreeView&, void);
- DECL_LINK(EditModifyHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(EditModifyHdl_Impl, weld::ComboBox&, void);
DECL_LINK(DistanceHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(DistanceFocusHdl_Impl, Control&, void);
DECL_LINK(RelativeHdl_Impl, weld::ToggleButton&, void);
@@ -433,7 +433,7 @@ class SvxNumPositionTabPage : public SfxTabPage
void InitPosAndSpaceMode();
void ShowControlsDependingOnPosAndSpaceMode();
- DECL_LINK(LabelFollowedByHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(LabelFollowedByHdl_Impl, weld::ComboBox&, void);
DECL_LINK(ListtabPosHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(AlignAtHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(IndentAtHdl_Impl, weld::MetricSpinButton&, void);
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 74155a61b0d3..69892a64f699 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -107,7 +107,7 @@ private:
std::unique_ptr<weld::RadioButton> m_xLandscapeBtn;
std::unique_ptr<weld::Label> m_xTextFlowLbl;
std::unique_ptr<svx::SvxFrameDirectionListBox> m_xTextFlowBox;
- std::unique_ptr<weld::ComboBoxText> m_xPaperTrayBox;
+ std::unique_ptr<weld::ComboBox> m_xPaperTrayBox;
// Margins
std::unique_ptr<weld::Label> m_xLeftMarginLbl;
std::unique_ptr<weld::MetricSpinButton> m_xLeftMarginEdit;
@@ -117,7 +117,7 @@ private:
std::unique_ptr<weld::MetricSpinButton> m_xBottomMarginEdit;
// layout settings
std::unique_ptr<weld::Label> m_xPageText;
- std::unique_ptr<weld::ComboBoxText> m_xLayoutBox;
+ std::unique_ptr<weld::ComboBox> m_xLayoutBox;
std::unique_ptr<SvxPageNumberListBox> m_xNumberFormatBox;
//Extras Calc
std::unique_ptr<weld::Label> m_xTblAlignFT;
@@ -128,15 +128,15 @@ private:
//Register Writer
std::unique_ptr<weld::CheckButton> m_xRegisterCB;
std::unique_ptr<weld::Label> m_xRegisterFT;
- std::unique_ptr<weld::ComboBoxText> m_xRegisterLB;
+ std::unique_ptr<weld::ComboBox> m_xRegisterLB;
std::unique_ptr<weld::Label> m_xInsideLbl;
std::unique_ptr<weld::Label> m_xOutsideLbl;
std::unique_ptr<weld::Label> m_xPrintRangeQueryText;
std::unique_ptr<weld::CustomWeld> m_xBspWin;
void Init_Impl();
- DECL_LINK(LayoutHdl_Impl, weld::ComboBoxText&, void);
- DECL_LINK(PaperBinHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(LayoutHdl_Impl, weld::ComboBox&, void);
+ DECL_LINK(PaperBinHdl_Impl, weld::ComboBox&, void);
DECL_LINK(SwapOrientation_Impl, weld::Button&, void);
void SwapFirstValues_Impl( bool bSet );
DECL_LINK(BorderModify_Impl, weld::MetricSpinButton&, void);
@@ -144,10 +144,10 @@ private:
DECL_LINK(CenterHdl_Impl, weld::ToggleButton&, void);
void UpdateExample_Impl( bool bResetbackground = false );
- DECL_LINK(PaperSizeSelect_Impl, weld::ComboBoxText&, void );
+ DECL_LINK(PaperSizeSelect_Impl, weld::ComboBox&, void );
DECL_LINK(PaperSizeModify_Impl, weld::MetricSpinButton&, void);
- DECL_LINK(FrameDirectionModify_Impl, weld::ComboBoxText&, void );
+ DECL_LINK(FrameDirectionModify_Impl, weld::ComboBox&, void );
void ResetBackground_Impl( const SfxItemSet& rSet );
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 16614656125c..b682fa126d60 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -77,7 +77,7 @@ private:
std::unique_ptr<weld::CheckButton> m_xContextualCB;
// line spacing
- std::unique_ptr<weld::ComboBoxText> m_xLineDist;
+ std::unique_ptr<weld::ComboBox> m_xLineDist;
std::unique_ptr<weld::MetricSpinButton> m_xLineDistAtPercentBox;
std::unique_ptr<weld::MetricSpinButton> m_xLineDistAtMetricBox;
std::unique_ptr<weld::Label> m_xLineDistAtLabel;
@@ -95,7 +95,7 @@ private:
void UpdateExample_Impl();
void ELRLoseFocus();
- DECL_LINK(LineDistHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(LineDistHdl_Impl, weld::ComboBox&, void);
DECL_LINK(ModifyHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(AutoHdl_Impl, weld::ToggleButton&, void);
@@ -145,7 +145,7 @@ class SvxParaAlignTabPage : public SfxTabPage
std::unique_ptr<weld::Label> m_xRightTop;
std::unique_ptr<weld::Label> m_xLastLineFT;
- std::unique_ptr<weld::ComboBoxText> m_xLastLineLB;
+ std::unique_ptr<weld::ComboBox> m_xLastLineLB;
std::unique_ptr<weld::CheckButton> m_xExpandCB;
std::unique_ptr<weld::CheckButton> m_xSnapToGridCB;
@@ -154,14 +154,14 @@ class SvxParaAlignTabPage : public SfxTabPage
std::unique_ptr<weld::CustomWeld> m_xExampleWin;
//vertical alignment
std::unique_ptr<weld::Widget> m_xVertAlignFL;
- std::unique_ptr<weld::ComboBoxText> m_xVertAlignLB;
+ std::unique_ptr<weld::ComboBox> m_xVertAlignLB;
std::unique_ptr<weld::Widget> m_xPropertiesFL;
std::unique_ptr<svx::SvxFrameDirectionListBox> m_xTextDirectionLB;
DECL_LINK(AlignHdl_Impl, weld::ToggleButton&, void);
- DECL_LINK(LastLineHdl_Impl, weld::ComboBoxText&, void);
- DECL_LINK(TextDirectionHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(LastLineHdl_Impl, weld::ComboBox&, void);
+ DECL_LINK(TextDirectionHdl_Impl, weld::ComboBox&, void);
void UpdateExample_Impl();
@@ -240,11 +240,11 @@ private:
// pagebreak
std::unique_ptr<weld::CheckButton> m_xPageBreakBox;
std::unique_ptr<weld::Label> m_xBreakTypeFT;
- std::unique_ptr<weld::ComboBoxText> m_xBreakTypeLB;
+ std::unique_ptr<weld::ComboBox> m_xBreakTypeLB;
std::unique_ptr<weld::Label> m_xBreakPositionFT;
- std::unique_ptr<weld::ComboBoxText> m_xBreakPositionLB;
+ std::unique_ptr<weld::ComboBox> m_xBreakPositionLB;
std::unique_ptr<weld::CheckButton> m_xApplyCollBtn;
- std::unique_ptr<weld::ComboBoxText> m_xApplyCollBox;
+ std::unique_ptr<weld::ComboBox> m_xApplyCollBox;
std::unique_ptr<weld::CheckButton> m_xPageNumBox;
std::unique_ptr<weld::SpinButton> m_xPagenumEdit;
@@ -267,8 +267,8 @@ private:
DECL_LINK(OrphanHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(HyphenClickHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(ApplyCollClickHdl_Impl, weld::ToggleButton&, void);
- DECL_LINK(PageBreakPosHdl_Impl, weld::ComboBoxText&, void);
- DECL_LINK(PageBreakTypeHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(PageBreakPosHdl_Impl, weld::ComboBox&, void);
+ DECL_LINK(PageBreakTypeHdl_Impl, weld::ComboBox&, void);
DECL_LINK(PageNumBoxClickHdl_Impl, weld::ToggleButton&, void);
virtual void PageCreated(const SfxAllItemSet& aSet) override;
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index d9e326dee456..9171ddf6cf04 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -72,26 +72,26 @@ class SvxSwPosSizeTabPage : public SfxTabPage
std::unique_ptr<weld::CheckButton> m_xSizeCB;
std::unique_ptr<weld::Widget> m_xPosFrame;
std::unique_ptr<weld::Label> m_xHoriFT;
- std::unique_ptr<weld::ComboBoxText> m_xHoriLB;
+ std::unique_ptr<weld::ComboBox> m_xHoriLB;
std::unique_ptr<weld::Label> m_xHoriByFT;
std::unique_ptr<weld::MetricSpinButton> m_xHoriByMF;
std::unique_ptr<weld::Label> m_xHoriToFT;
- std::unique_ptr<weld::ComboBoxText> m_xHoriToLB;
+ std::unique_ptr<weld::ComboBox> m_xHoriToLB;
std::unique_ptr<weld::CheckButton> m_xHoriMirrorCB;
std::unique_ptr<weld::Label> m_xVertFT;
- std::unique_ptr<weld::ComboBoxText> m_xVertLB;
+ std::unique_ptr<weld::ComboBox> m_xVertLB;
std::unique_ptr<weld::Label> m_xVertByFT;
std::unique_ptr<weld::MetricSpinButton> m_xVertByMF;
std::unique_ptr<weld::Label> m_xVertToFT;
- std::unique_ptr<weld::ComboBoxText> m_xVertToLB;
+ std::unique_ptr<weld::ComboBox> m_xVertToLB;
std::unique_ptr<weld::CheckButton> m_xFollowCB;
std::unique_ptr<weld::CustomWeld> m_xExampleWN;
DECL_LINK(RangeModifyHdl, weld::Widget&, void);
DECL_LINK(RangeModifyClickHdl, weld::ToggleButton&, void);
DECL_LINK(AnchorTypeHdl, weld::ToggleButton&, void);
- DECL_LINK(PosHdl, weld::ComboBoxText&, void);
- DECL_LINK(RelHdl, weld::ComboBoxText&, void);
+ DECL_LINK(PosHdl, weld::ComboBox&, void);
+ DECL_LINK(RelHdl, weld::ComboBox&, void);
DECL_LINK(MirrorHdl, weld::ToggleButton&, void);
DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void);
DECL_LINK(ProtectHdl, weld::ToggleButton&, void);
@@ -99,12 +99,12 @@ class SvxSwPosSizeTabPage : public SfxTabPage
void InitPos(RndStdIds nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel,
sal_uInt16 nV, sal_uInt16 nVRel,
long nX, long nY);
- static sal_uInt16 GetMapPos(FrmMap const *pMap, const weld::ComboBoxText& rAlignLB);
- static short GetAlignment(FrmMap const *pMap, sal_uInt16 nMapPos, const weld::ComboBoxText& rRelationLB);
- static short GetRelation(const weld::ComboBoxText& rRelationLB);
+ static sal_uInt16 GetMapPos(FrmMap const *pMap, const weld::ComboBox& rAlignLB);
+ static short GetAlignment(FrmMap const *pMap, sal_uInt16 nMapPos, const weld::ComboBox& rRelationLB);
+ static short GetRelation(const weld::ComboBox& rRelationLB);
RndStdIds GetAnchorType(bool* pbHasChanged = nullptr);
- void FillRelLB(FrmMap const *pMap, sal_uInt16 nLBSelPos, sal_uInt16 nAlign, sal_uInt16 nRel, weld::ComboBoxText& rLB, weld::Label& rFT);
- sal_uInt16 FillPosLB(FrmMap const *pMap, sal_uInt16 nAlign, const sal_uInt16 _nRel, weld::ComboBoxText& rLB);
+ void FillRelLB(FrmMap const *pMap, sal_uInt16 nLBSelPos, sal_uInt16 nAlign, sal_uInt16 nRel, weld::ComboBox& rLB, weld::Label& rFT);
+ sal_uInt16 FillPosLB(FrmMap const *pMap, sal_uInt16 nAlign, const sal_uInt16 _nRel, weld::ComboBox& rLB);
void UpdateExample();
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 953399d718e8..6f67a27009e0 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -49,7 +49,7 @@ private:
TriState m_aRightState;
TriState m_aDownState;
- std::unique_ptr<weld::ComboBoxText> m_xLbEffect;
+ std::unique_ptr<weld::ComboBox> m_xLbEffect;
std::unique_ptr<weld::Widget> m_xBoxDirection;
std::unique_ptr<weld::ToggleButton> m_xBtnUp;
std::unique_ptr<weld::ToggleButton> m_xBtnLeft;
@@ -70,7 +70,7 @@ private:
std::unique_ptr<weld::CheckButton> m_xTsbAuto;
std::unique_ptr<weld::MetricSpinButton> m_xMtrFldDelay;
- DECL_LINK( SelectEffectHdl_Impl, weld::ComboBoxText&, void );
+ DECL_LINK( SelectEffectHdl_Impl, weld::ComboBox&, void );
DECL_LINK( ClickEndlessHdl_Impl, weld::Button&, void );
DECL_LINK( ClickAutoHdl_Impl, weld::Button&, void );
DECL_LINK( ClickPixelHdl_Impl, weld::Button&, void );
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index e5d3bda009f5..0c3c5d2bd045 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -95,7 +95,7 @@ static CDE_RESULT cmpDicEntry_Impl( const OUString &rText1, const OUString &rTex
SvxNewDictionaryDialog::SvxNewDictionaryDialog(weld::Window* pParent)
: GenericDialogController(pParent, "cui/ui/optnewdictionarydialog.ui", "OptNewDictionaryDialog")
, m_xNameEdit(m_xBuilder->weld_entry("nameedit"))
- , m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box_text("language")))
+ , m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("language")))
, m_xExceptBtn(m_xBuilder->weld_check_button("except"))
, m_xOKBtn(m_xBuilder->weld_button("ok"))
{
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 47da6b964256..05342be06ab8 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1559,7 +1559,7 @@ void SvxBkgTabPage::PageCreated(const SfxAllItemSet& aSet)
if ( nFlags & SvxBackgroundTabFlags::SHOW_TBLCTL )
{
m_xBtnBitmap->show();
- m_xTblLBox = m_xBuilder->weld_combo_box_text("tablelb");
+ m_xTblLBox = m_xBuilder->weld_combo_box("tablelb");
m_xTblLBox->set_active(0);
m_xTblLBox->show();
}
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 6358dee9f77a..84d0aa2b2006 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -228,24 +228,24 @@ SvxCharNamePage::SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rInSet
, m_pImpl(new SvxCharNamePage_Impl)
, m_xEastFrame(m_xBuilder->weld_widget("asian"))
, m_xEastFontNameFT(m_xBuilder->weld_label("eastfontnameft"))
- , m_xEastFontNameLB(m_xBuilder->weld_combo_box_text("eastfontnamelb"))
+ , m_xEastFontNameLB(m_xBuilder->weld_combo_box("eastfontnamelb"))
, m_xEastFontStyleFT(m_xBuilder->weld_label("eaststyleft"))
- , m_xEastFontStyleLB(new SvtFontStyleBox(m_xBuilder->weld_combo_box_text("eaststylelb")))
+ , m_xEastFontStyleLB(new SvtFontStyleBox(m_xBuilder->weld_combo_box("eaststylelb")))
, m_xEastFontSizeFT(m_xBuilder->weld_label("eastsizeft"))
- , m_xEastFontSizeLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box_text("eastsizelb")))
+ , m_xEastFontSizeLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box("eastsizelb")))
, m_xEastFontLanguageFT(m_xBuilder->weld_label("eastlangft"))
- , m_xEastFontLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box_text("eastlanglb")))
+ , m_xEastFontLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("eastlanglb")))
, m_xEastFontTypeFT(m_xBuilder->weld_label("eastfontinfo"))
, m_xEastFontFeaturesButton(m_xBuilder->weld_button("east_features_button"))
, m_xCTLFrame(m_xBuilder->weld_widget("ctl"))
, m_xCTLFontNameFT(m_xBuilder->weld_label("ctlfontnameft"))
- , m_xCTLFontNameLB(m_xBuilder->weld_combo_box_text("ctlfontnamelb"))
+ , m_xCTLFontNameLB(m_xBuilder->weld_combo_box("ctlfontnamelb"))
, m_xCTLFontStyleFT(m_xBuilder->weld_label("ctlstyleft"))
- , m_xCTLFontStyleLB(new SvtFontStyleBox(m_xBuilder->weld_combo_box_text("ctlstylelb")))
+ , m_xCTLFontStyleLB(new SvtFontStyleBox(m_xBuilder->weld_combo_box("ctlstylelb")))
, m_xCTLFontSizeFT(m_xBuilder->weld_label("ctlsizeft"))
- , m_xCTLFontSizeLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box_text("ctlsizelb")))
+ , m_xCTLFontSizeLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box("ctlsizelb")))
, m_xCTLFontLanguageFT(m_xBuilder->weld_label("ctllangft"))
- , m_xCTLFontLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box_text("ctllanglb")))
+ , m_xCTLFontLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("ctllanglb")))
, m_xCTLFontTypeFT(m_xBuilder->weld_label("ctlfontinfo"))
, m_xCTLFontFeaturesButton(m_xBuilder->weld_button("ctl_features_button"))
{
@@ -262,15 +262,15 @@ SvxCharNamePage::SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rInSet
{
m_xWestFrame = m_xBuilder->weld_widget("western");
m_xWestFontNameFT = m_xBuilder->weld_label("westfontnameft-cjk");
- m_xWestFontNameLB = m_xBuilder->weld_combo_box_text("westfontnamelb-cjk");
+ m_xWestFontNameLB = m_xBuilder->weld_combo_box("westfontnamelb-cjk");
m_xWestFontStyleFT = m_xBuilder->weld_label("weststyleft-cjk");
m_xWestFontSizeFT = m_xBuilder->weld_label("westsizeft-cjk");
- m_xWestFontStyleLB.reset(new SvtFontStyleBox(m_xBuilder->weld_combo_box_text("weststylelb-cjk")));
- m_xWestFontSizeLB.reset(new SvtFontSizeBox(m_xBuilder->weld_combo_box_text("westsizelb-cjk")));
+ m_xWestFontStyleLB.reset(new SvtFontStyleBox(m_xBuilder->weld_combo_box("weststylelb-cjk")));
+ m_xWestFontSizeLB.reset(new SvtFontSizeBox(m_xBuilder->weld_combo_box("westsizelb-cjk")));
m_xWestFontLanguageFT = m_xBuilder->weld_label("westlangft-cjk");
- m_xWestFontLanguageLB.reset(new LanguageBox(m_xBuilder->weld_combo_box_text("westlanglb-cjk")));
+ m_xWestFontLanguageLB.reset(new LanguageBox(m_xBuilder->weld_combo_box("westlanglb-cjk")));
m_xWestFontTypeFT = m_xBuilder->weld_label("westfontinfo-cjk");
m_xWestFontFeaturesButton = m_xBuilder->weld_button("west_features_button-cjk");
@@ -283,7 +283,7 @@ SvxCharNamePage::SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rInSet
m_xWestFontSizeFT = m_xBuilder->weld_label("westsizeft-nocjk");
m_xWestFontLanguageFT = m_xBuilder->weld_label("westlangft-nocjk");
- m_xWestFontLanguageLB.reset(new LanguageBox(m_xBuilder->weld_combo_box_text("westlanglb-nocjk")));
+ m_xWestFontLanguageLB.reset(new LanguageBox(m_xBuilder->weld_combo_box("westlanglb-nocjk")));
m_xWestFontTypeFT = m_xBuilder->weld_label("westfontinfo-nocjk");
m_xWestFontFeaturesButton = m_xBuilder->weld_button("west_features_button-nocjk");
@@ -363,7 +363,7 @@ void SvxCharNamePage::Initialize()
// to handle the changes of the other pages
SetExchangeSupport();
- Link<weld::ComboBoxText&,void> aLink = LINK(this, SvxCharNamePage, FontModifyComboBoxHdl_Impl);
+ Link<weld::ComboBox&,void> aLink = LINK(this, SvxCharNamePage, FontModifyComboBoxHdl_Impl);
m_xWestFontNameLB->connect_changed(aLink);
m_xWestFontStyleLB->connect_changed(aLink);
m_xWestFontSizeLB->connect_changed(aLink);
@@ -417,7 +417,7 @@ namespace
{
FontMetric calcFontMetrics( SvxFont& _rFont,
SvxCharNamePage const * _pPage,
- const weld::ComboBoxText* _pFontNameLB,
+ const weld::ComboBox* _pFontNameLB,
const SvtFontStyleBox* _pFontStyleLB,
const SvtFontSizeBox* _pFontSizeLB,
const LanguageBox* _pLanguageLB,
@@ -601,7 +601,7 @@ void SvxCharNamePage::FillSizeBox_Impl(const weld::Widget& rNameBox)
namespace
{
- void FillFontNames(weld::ComboBoxText& rBox, const FontList& rList)
+ void FillFontNames(weld::ComboBox& rBox, const FontList& rList)
{
// insert fonts
rBox.freeze();
@@ -618,7 +618,7 @@ namespace
void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp )
{
- weld::ComboBoxText* pNameBox = nullptr;
+ weld::ComboBox* pNameBox = nullptr;
weld::Label* pStyleLabel = nullptr;
SvtFontStyleBox* pStyleBox = nullptr;
weld::Label* pSizeLabel = nullptr;
@@ -844,7 +844,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
{
bool bModified = false;
- weld::ComboBoxText* pNameBox = nullptr;
+ weld::ComboBox* pNameBox = nullptr;
SvtFontStyleBox* pStyleBox = nullptr;
SvtFontSizeBox* pSizeBox = nullptr;
LanguageBox* pLangBox = nullptr;
@@ -1133,7 +1133,7 @@ IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl, Timer *, void)
UpdatePreview_Impl();
}
-IMPL_LINK(SvxCharNamePage, FontModifyComboBoxHdl_Impl, weld::ComboBoxText&, rBox, void)
+IMPL_LINK(SvxCharNamePage, FontModifyComboBoxHdl_Impl, weld::ComboBox&, rBox, void)
{
FontModifyHdl_Impl(rBox);
}
@@ -1146,7 +1146,7 @@ IMPL_LINK(SvxCharNamePage, FontModifyEditHdl_Impl, weld::Entry&, rBox, void)
IMPL_LINK(SvxCharNamePage, FontFeatureButtonClicked, weld::Button&, rButton, void)
{
OUString sFontName;
- weld::ComboBoxText* pNameBox = nullptr;
+ weld::ComboBox* pNameBox = nullptr;
if (&rButton == m_xWestFontFeaturesButton.get())
{
@@ -1330,25 +1330,25 @@ SvxCharEffectsPage::SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet&
, m_xFontColorFT(m_xBuilder->weld_label("fontcolorft"))
, m_xFontColorLB(new ColorListBox(m_xBuilder->weld_menu_button("fontcolorlb"), pParent.GetFrameWeld()))
, m_xEffectsFT(m_xBuilder->weld_label("effectsft"))
- , m_xEffectsLB(m_xBuilder->weld_combo_box_text("effectslb"))
+ , m_xEffectsLB(m_xBuilder->weld_combo_box("effectslb"))
, m_xReliefFT(m_xBuilder->weld_label("reliefft"))
- , m_xReliefLB(m_xBuilder->weld_combo_box_text("relieflb"))
+ , m_xReliefLB(m_xBuilder->weld_combo_box("relieflb"))
, m_xOutlineBtn(m_xBuilder->weld_check_button("outlinecb"))
, m_xShadowBtn(m_xBuilder->weld_check_button("shadowcb"))
, m_xBlinkingBtn(m_xBuilder->weld_check_button("blinkingcb"))
, m_xHiddenBtn(m_xBuilder->weld_check_button("hiddencb"))
- , m_xOverlineLB(m_xBuilder->weld_combo_box_text("overlinelb"))
+ , m_xOverlineLB(m_xBuilder->weld_combo_box("overlinelb"))
, m_xOverlineColorFT(m_xBuilder->weld_label("overlinecolorft"))
, m_xOverlineColorLB(new ColorListBox(m_xBuilder->weld_menu_button("overlinecolorlb"), pParent.GetFrameWeld()))
- , m_xStrikeoutLB(m_xBuilder->weld_combo_box_text("strikeoutlb"))
- , m_xUnderlineLB(m_xBuilder->weld_combo_box_text("underlinelb"))
+ , m_xStrikeoutLB(m_xBuilder->weld_combo_box("strikeoutlb"))
+ , m_xUnderlineLB(m_xBuilder->weld_combo_box("underlinelb"))
, m_xUnderlineColorFT(m_xBuilder->weld_label("underlinecolorft"))
, m_xUnderlineColorLB(new ColorListBox(m_xBuilder->weld_menu_button("underlinecolorlb"), pParent.GetFrameWeld()))
, m_xIndividualWordsBtn(m_xBuilder->weld_check_button("individualwordscb"))
, m_xEmphasisFT(m_xBuilder->weld_label("emphasisft"))
- , m_xEmphasisLB(m_xBuilder->weld_combo_box_text("emphasislb"))
+ , m_xEmphasisLB(m_xBuilder->weld_combo_box("emphasislb"))
, m_xPositionFT(m_xBuilder->weld_label("positionft"))
- , m_xPositionLB(m_xBuilder->weld_combo_box_text("positionlb"))
+ , m_xPositionLB(m_xBuilder->weld_combo_box("positionlb"))
, m_xA11yWarningFT(m_xBuilder->weld_label("a11ywarning"))
{
m_xPreviewWin.reset(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWin));
@@ -1408,7 +1408,7 @@ void SvxCharEffectsPage::Initialize()
m_xFontColorLB->SetSelectHdl(LINK(this, SvxCharEffectsPage, ColorBoxSelectHdl_Impl));
// handler
- Link<weld::ComboBoxText&,void> aLink = LINK( this, SvxCharEffectsPage, SelectListBoxHdl_Impl );
+ Link<weld::ComboBox&,void> aLink = LINK( this, SvxCharEffectsPage, SelectListBoxHdl_Impl );
m_xUnderlineLB->connect_changed( aLink );
m_xUnderlineColorLB->SetSelectHdl(LINK(this, SvxCharEffectsPage, ColorBoxSelectHdl_Impl));
m_xOverlineLB->connect_changed( aLink );
@@ -1606,12 +1606,12 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet )
return bChanged;
}
-IMPL_LINK( SvxCharEffectsPage, SelectListBoxHdl_Impl, weld::ComboBoxText&, rBox, void )
+IMPL_LINK( SvxCharEffectsPage, SelectListBoxHdl_Impl, weld::ComboBox&, rBox, void )
{
SelectHdl_Impl(&rBox);
}
-void SvxCharEffectsPage::SelectHdl_Impl(weld::ComboBoxText* pBox)
+void SvxCharEffectsPage::SelectHdl_Impl(weld::ComboBox* pBox)
{
if (m_xEmphasisLB.get() == pBox)
{
@@ -1648,7 +1648,7 @@ void SvxCharEffectsPage::SelectHdl_Impl(weld::ComboBoxText* pBox)
UpdatePreview_Impl();
}
-IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl, weld::ComboBox&, void)
{
bool bEnable = ( ( m_xUnderlineLB->get_active() > 0 ) ||
( m_xOverlineLB->get_active() > 0 ) ||
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 1b612cf6357d..680b78f41878 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -82,12 +82,12 @@ SvxCaptionTabPage::SvxCaptionTabPage(TabPageParent pParent, const SfxItemSet& rI
, rOutAttrs(rInAttrs)
, pView(nullptr)
, m_xMF_SPACING(m_xBuilder->weld_metric_spin_button("spacing", FUNIT_MM))
- , m_xLB_EXTENSION(m_xBuilder->weld_combo_box_text("extension"))
+ , m_xLB_EXTENSION(m_xBuilder->weld_combo_box("extension"))
, m_xFT_BYFT(m_xBuilder->weld_label("byft"))
, m_xMF_BY(m_xBuilder->weld_metric_spin_button("by", FUNIT_MM))
, m_xFT_POSITIONFT(m_xBuilder->weld_label("positionft"))
- , m_xLB_POSITION(m_xBuilder->weld_combo_box_text("position"))
- , m_xLineTypes(m_xBuilder->weld_combo_box_text("linetypes"))
+ , m_xLB_POSITION(m_xBuilder->weld_combo_box("position"))
+ , m_xLineTypes(m_xBuilder->weld_combo_box("linetypes"))
, m_xFT_LENGTHFT(m_xBuilder->weld_label("lengthft"))
, m_xMF_LENGTH(m_xBuilder->weld_metric_spin_button("length", FUNIT_MM))
, m_xCB_OPTIMAL(m_xBuilder->weld_check_button("optimal"))
@@ -402,7 +402,7 @@ void SvxCaptionTabPage::SetupExtension_Impl( sal_uInt16 nType )
}
}
-IMPL_LINK(SvxCaptionTabPage, ExtensionSelectHdl_Impl, weld::ComboBoxText&, rListBox, void)
+IMPL_LINK(SvxCaptionTabPage, ExtensionSelectHdl_Impl, weld::ComboBox&, rListBox, void)
{
if (&rListBox == m_xLB_EXTENSION.get())
{
@@ -410,7 +410,7 @@ IMPL_LINK(SvxCaptionTabPage, ExtensionSelectHdl_Impl, weld::ComboBoxText&, rList
}
}
-IMPL_LINK(SvxCaptionTabPage, PositionSelectHdl_Impl, weld::ComboBoxText&, rListBox, void)
+IMPL_LINK(SvxCaptionTabPage, PositionSelectHdl_Impl, weld::ComboBox&, rListBox, void)
{
if (&rListBox == m_xLB_POSITION.get())
{
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 9edbc09a02bc..8451dd787d63 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2825,13 +2825,13 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(TabPageParent pParent, const SfxIte
, m_xDistNumFT(m_xBuilder->weld_label("numdist"))
, m_xDistNumMF(m_xBuilder->weld_metric_spin_button("numdistmf", FUNIT_CM))
, m_xAlignFT(m_xBuilder->weld_label("numalign"))
- , m_xAlignLB(m_xBuilder->weld_combo_box_text("numalignlb"))
+ , m_xAlignLB(m_xBuilder->weld_combo_box("numalignlb"))
, m_xLabelFollowedByFT(m_xBuilder->weld_label("numfollowedby"))
- , m_xLabelFollowedByLB(m_xBuilder->weld_combo_box_text("numfollowedbylb"))
+ , m_xLabelFollowedByLB(m_xBuilder->weld_combo_box("numfollowedbylb"))
, m_xListtabFT(m_xBuilder->weld_label("at"))
, m_xListtabMF(m_xBuilder->weld_metric_spin_button("atmf", FUNIT_CM))
, m_xAlign2FT(m_xBuilder->weld_label("num2align"))
- , m_xAlign2LB(m_xBuilder->weld_combo_box_text("num2alignlb"))
+ , m_xAlign2LB(m_xBuilder->weld_combo_box("num2alignlb"))
, m_xAlignedAtFT(m_xBuilder->weld_label("alignedat"))
, m_xAlignedAtMF(m_xBuilder->weld_metric_spin_button("alignedatmf", FUNIT_CM))
, m_xIndentAtFT(m_xBuilder->weld_label("indentat"))
@@ -3292,7 +3292,7 @@ void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric)
m_xIndentAtMF->set_unit(eMetric);
}
-IMPL_LINK_NOARG(SvxNumPositionTabPage, EditModifyHdl_Impl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxNumPositionTabPage, EditModifyHdl_Impl, weld::ComboBox&, void)
{
sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
@@ -3462,7 +3462,7 @@ IMPL_LINK(SvxNumPositionTabPage, RelativeHdl_Impl, weld::ToggleButton&, rBox, vo
bLastRelative = bOn;
}
-IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, weld::ComboBox&, void)
{
// determine value to be set at the chosen list levels
SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB;
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 7776f0027df0..db3b1977d39d 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -152,15 +152,15 @@ SvxPageDescPage::SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rAttr)
, mpDefPrinter(nullptr)
, mbDelPrinter(false)
, mbEnableDrawingLayerFillStyles(false)
- , m_xPaperSizeBox(new SvxPaperSizeListBox(m_xBuilder->weld_combo_box_text("comboPageFormat")))
+ , m_xPaperSizeBox(new SvxPaperSizeListBox(m_xBuilder->weld_combo_box("comboPageFormat")))
, m_xPaperWidthEdit(m_xBuilder->weld_metric_spin_button("spinWidth", FUNIT_CM))
, m_xPaperHeightEdit(m_xBuilder->weld_metric_spin_button("spinHeight", FUNIT_CM))
, m_xOrientationFT(m_xBuilder->weld_label("labelOrientation"))
, m_xPortraitBtn(m_xBuilder->weld_radio_button("radiobuttonPortrait"))
, m_xLandscapeBtn(m_xBuilder->weld_radio_button("radiobuttonLandscape"))
, m_xTextFlowLbl(m_xBuilder->weld_label("labelTextFlow"))
- , m_xTextFlowBox(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box_text("comboTextFlowBox")))
- , m_xPaperTrayBox(m_xBuilder->weld_combo_box_text("comboPaperTray"))
+ , m_xTextFlowBox(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box("comboTextFlowBox")))
+ , m_xPaperTrayBox(m_xBuilder->weld_combo_box("comboPaperTray"))
, m_xLeftMarginLbl(m_xBuilder->weld_label("labelLeftMargin"))
, m_xLeftMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargLeft", FUNIT_CM))
, m_xRightMarginLbl(m_xBuilder->weld_label("labelRightMargin"))
@@ -168,15 +168,15 @@ SvxPageDescPage::SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rAttr)
, m_xTopMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargTop", FUNIT_CM))
, m_xBottomMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargBot", FUNIT_CM))
, m_xPageText(m_xBuilder->weld_label("labelPageLayout"))
- , m_xLayoutBox(m_xBuilder->weld_combo_box_text("comboPageLayout"))
- , m_xNumberFormatBox(new SvxPageNumberListBox(m_xBuilder->weld_combo_box_text("comboLayoutFormat")))
+ , m_xLayoutBox(m_xBuilder->weld_combo_box("comboPageLayout"))
+ , m_xNumberFormatBox(new SvxPageNumberListBox(m_xBuilder->weld_combo_box("comboLayoutFormat")))
, m_xTblAlignFT(m_xBuilder->weld_label("labelTblAlign"))
, m_xHorzBox(m_xBuilder->weld_check_button("checkbuttonHorz"))
, m_xVertBox(m_xBuilder->weld_check_button("checkbuttonVert"))
, m_xAdaptBox(m_xBuilder->weld_check_button("checkAdaptBox"))
, m_xRegisterCB(m_xBuilder->weld_check_button("checkRegisterTrue"))
, m_xRegisterFT(m_xBuilder->weld_label("labelRegisterStyle"))
- , m_xRegisterLB(m_xBuilder->weld_combo_box_text("comboRegisterStyle"))
+ , m_xRegisterLB(m_xBuilder->weld_combo_box("comboRegisterStyle"))
// Strings stored in UI
, m_xInsideLbl(m_xBuilder->weld_label("labelInner"))
, m_xOutsideLbl(m_xBuilder->weld_label("labelOuter"))
@@ -786,7 +786,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
return bModified;
}
-IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl, weld::ComboBox&, void)
{
// switch inside outside
const SvxPageUsage nUsage = PosToPageUsage_Impl(m_xLayoutBox->get_active());
@@ -808,7 +808,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl, weld::ComboBoxText&, void)
UpdateExample_Impl( true );
}
-IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, weld::ComboBox&, void)
{
if (m_xPaperTrayBox->get_count() > 1)
// already filled
@@ -834,7 +834,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, weld::ComboBoxText&, void)
m_xPaperTrayBox->thaw();
}
-IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeSelect_Impl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeSelect_Impl, weld::ComboBox&, void)
{
Paper ePaper = m_xPaperSizeBox->GetSelection();
@@ -1463,7 +1463,7 @@ void SvxPageDescPage::DisableVerticalPageDir()
}
}
-IMPL_LINK_NOARG(SvxPageDescPage, FrameDirectionModify_Impl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxPageDescPage, FrameDirectionModify_Impl, weld::ComboBox&, void)
{
m_aBspWin.SetFrameDirection(m_xTextFlowBox->get_active_id());
m_aBspWin.Invalidate();
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 3e0c7fb9e7a9..ffb7e831e755 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -683,7 +683,7 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage(TabPageParent pParent, const Sfx
, m_xTopDist(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_TOPDIST", FUNIT_CM)))
, m_xBottomDist(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_BOTTOMDIST", FUNIT_CM)))
, m_xContextualCB(m_xBuilder->weld_check_button("checkCB_CONTEXTUALSPACING"))
- , m_xLineDist(m_xBuilder->weld_combo_box_text("comboLB_LINEDIST"))
+ , m_xLineDist(m_xBuilder->weld_combo_box("comboLB_LINEDIST"))
, m_xLineDistAtPercentBox(m_xBuilder->weld_metric_spin_button("spinED_LINEDISTPERCENT", FUNIT_PERCENT))
, m_xLineDistAtMetricBox(m_xBuilder->weld_metric_spin_button("spinED_LINEDISTMETRIC", FUNIT_CM))
, m_xLineDistAtLabel(m_xBuilder->weld_label("labelFT_LINEDIST"))
@@ -787,7 +787,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl
LineDistHdl_Impl( *m_xLineDist );
}
-IMPL_LINK(SvxStdParagraphTabPage, LineDistHdl_Impl, weld::ComboBoxText&, rBox, void)
+IMPL_LINK(SvxStdParagraphTabPage, LineDistHdl_Impl, weld::ComboBox&, rBox, void)
{
switch (rBox.get_active())
{
@@ -999,14 +999,14 @@ SvxParaAlignTabPage::SvxParaAlignTabPage(TabPageParent pParent, const SfxItemSet
, m_xLeftBottom(m_xBuilder->weld_label("labelST_LEFTALIGN_ASIAN"))
, m_xRightTop(m_xBuilder->weld_label("labelST_RIGHTALIGN_ASIAN"))
, m_xLastLineFT(m_xBuilder->weld_label("labelLB_LASTLINE"))
- , m_xLastLineLB(m_xBuilder->weld_combo_box_text("comboLB_LASTLINE"))
+ , m_xLastLineLB(m_xBuilder->weld_combo_box("comboLB_LASTLINE"))
, m_xExpandCB(m_xBuilder->weld_check_button("checkCB_EXPAND"))
, m_xSnapToGridCB(m_xBuilder->weld_check_button("checkCB_SNAP"))
, m_xExampleWin(new weld::CustomWeld(*m_xBuilder, "drawingareaWN_EXAMPLE", m_aExampleWin))
, m_xVertAlignFL(m_xBuilder->weld_widget("frameFL_VERTALIGN"))
- , m_xVertAlignLB(m_xBuilder->weld_combo_box_text("comboLB_VERTALIGN"))
+ , m_xVertAlignLB(m_xBuilder->weld_combo_box("comboLB_VERTALIGN"))
, m_xPropertiesFL(m_xBuilder->weld_widget("framePROPERTIES"))
- , m_xTextDirectionLB(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box_text("comboLB_TEXTDIRECTION")))
+ , m_xTextDirectionLB(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box("comboLB_TEXTDIRECTION")))
{
SetExchangeSupport();
@@ -1252,7 +1252,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl, weld::ToggleButton&, void)
UpdateExample_Impl();
}
-IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl, weld::ComboBox&, void)
{
//fdo#41350 only enable 'Expand last word' if last line is also justified
bool bLastLineIsBlock = m_xLastLineLB->get_active() == 2;
@@ -1263,7 +1263,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl, weld::ComboBoxText&, void
UpdateExample_Impl();
}
-IMPL_LINK_NOARG(SvxParaAlignTabPage, TextDirectionHdl_Impl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxParaAlignTabPage, TextDirectionHdl_Impl, weld::ComboBox&, void)
{
UpdateExample_Impl();
}
@@ -1883,11 +1883,11 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage(TabPageParent pParent, const SfxI
//Page break
, m_xPageBreakBox(m_xBuilder->weld_check_button("checkInsert"))
, m_xBreakTypeFT(m_xBuilder->weld_label("labelType"))
- , m_xBreakTypeLB(m_xBuilder->weld_combo_box_text("comboBreakType"))
+ , m_xBreakTypeLB(m_xBuilder->weld_combo_box("comboBreakType"))
, m_xBreakPositionFT(m_xBuilder->weld_label("labelPosition"))
- , m_xBreakPositionLB(m_xBuilder->weld_combo_box_text("comboBreakPosition"))
+ , m_xBreakPositionLB(m_xBuilder->weld_combo_box("comboBreakPosition"))
, m_xApplyCollBtn(m_xBuilder->weld_check_button("checkPageStyle"))
- , m_xApplyCollBox(m_xBuilder->weld_combo_box_text("comboPageStyle"))
+ , m_xApplyCollBox(m_xBuilder->weld_combo_box("comboPageStyle"))
, m_xPageNumBox(m_xBuilder->weld_check_button("labelPageNum"))
, m_xPagenumEdit(m_xBuilder->weld_spin_button("spinPageNumber"))
// Options
@@ -2074,7 +2074,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, weld::ToggleButt
}
}
-IMPL_LINK(SvxExtParagraphTabPage, PageBreakPosHdl_Impl, weld::ComboBoxText&, rListBox, void)
+IMPL_LINK(SvxExtParagraphTabPage, PageBreakPosHdl_Impl, weld::ComboBox&, rListBox, void)
{
if (0 == rListBox.get_active())
{
@@ -2099,7 +2099,7 @@ IMPL_LINK(SvxExtParagraphTabPage, PageBreakPosHdl_Impl, weld::ComboBoxText&, rLi
}
}
-IMPL_LINK(SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, weld::ComboBoxText&, rListBox, void)
+IMPL_LINK(SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, weld::ComboBox&, rListBox, void)
{
//column break or break after
int nBreakPos = m_xBreakPositionLB->get_active();
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 7c9282ab7614..fb8c48facc2a 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -537,18 +537,18 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(TabPageParent pParent, const SfxItemSet
, m_xSizeCB(m_xBuilder->weld_check_button("size"))
, m_xPosFrame(m_xBuilder->weld_widget("posframe"))
, m_xHoriFT(m_xBuilder->weld_label("horiposft"))
- , m_xHoriLB(m_xBuilder->weld_combo_box_text("horipos"))
+ , m_xHoriLB(m_xBuilder->weld_combo_box("horipos"))
, m_xHoriByFT(m_xBuilder->weld_label("horibyft"))
, m_xHoriByMF(m_xBuilder->weld_metric_spin_button("byhori", FUNIT_CM))
, m_xHoriToFT(m_xBuilder->weld_label("horitoft"))
- , m_xHoriToLB(m_xBuilder->weld_combo_box_text("horianchor"))
+ , m_xHoriToLB(m_xBuilder->weld_combo_box("horianchor"))
, m_xHoriMirrorCB(m_xBuilder->weld_check_button("mirror"))
, m_xVertFT(m_xBuilder->weld_label("vertposft"))
- , m_xVertLB(m_xBuilder->weld_combo_box_text("vertpos"))
+ , m_xVertLB(m_xBuilder->weld_combo_box("vertpos"))
, m_xVertByFT(m_xBuilder->weld_label("vertbyft"))
, m_xVertByMF(m_xBuilder->weld_metric_spin_button("byvert", FUNIT_CM))
, m_xVertToFT(m_xBuilder->weld_label("verttoft"))
- , m_xVertToLB(m_xBuilder->weld_combo_box_text("vertanchor"))
+ , m_xVertToLB(m_xBuilder->weld_combo_box("vertanchor"))
, m_xFollowCB(m_xBuilder->weld_check_button("followtextflow"))
, m_xExampleWN(new weld::CustomWeld(*m_xBuilder, "preview", m_aExampleWN))
{
@@ -1210,7 +1210,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, MirrorHdl, weld::ToggleButton&, void)
InitPos( nId, USHRT_MAX, 0, USHRT_MAX, 0, LONG_MAX, LONG_MAX);
}
-IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, weld::ComboBoxText&, rLB, void )
+IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, weld::ComboBox&, rLB, void )
{
bool bHori = &rLB == m_xHoriToLB.get();
@@ -1234,10 +1234,10 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, weld::ComboBoxText&, rLB, void )
RangeModifyHdl(m_xWidthMF->get_widget());
}
-IMPL_LINK(SvxSwPosSizeTabPage, PosHdl, weld::ComboBoxText&, rLB, void)
+IMPL_LINK(SvxSwPosSizeTabPage, PosHdl, weld::ComboBox&, rLB, void)
{
bool bHori = &rLB == m_xHoriLB.get();
- weld::ComboBoxText* pRelLB = bHori ? m_xHoriToLB.get() : m_xVertToLB.get();
+ weld::ComboBox* pRelLB = bHori ? m_xHoriToLB.get() : m_xVertToLB.get();
weld::Label* pRelFT = bHori ? m_xHoriToFT.get() : m_xVertToFT.get();
FrmMap *pMap = bHori ? m_pHMap : m_pVMap;
@@ -1362,7 +1362,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl, weld::ToggleButton&, void)
m_xSizeCB->set_sensitive(m_xPositionCB->get_sensitive() && !m_xPositionCB->get_active());
}
-short SvxSwPosSizeTabPage::GetRelation(const weld::ComboBoxText& rRelationLB)
+short SvxSwPosSizeTabPage::GetRelation(const weld::ComboBox& rRelationLB)
{
short nRel = 0;
int nPos = rRelationLB.get_active();
@@ -1375,7 +1375,7 @@ short SvxSwPosSizeTabPage::GetRelation(const weld::ComboBoxText& rRelationLB)
return nRel;
}
-short SvxSwPosSizeTabPage::GetAlignment(FrmMap const *pMap, sal_uInt16 nMapPos, const weld::ComboBoxText& rRelationLB)
+short SvxSwPosSizeTabPage::GetAlignment(FrmMap const *pMap, sal_uInt16 nMapPos, const weld::ComboBox& rRelationLB)
{
short nAlign = 0;
@@ -1410,7 +1410,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap const *pMap, sal_uInt16 nMapPos,
return nAlign;
}
-sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap const *pMap, const weld::ComboBoxText& rAlignLB)
+sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap const *pMap, const weld::ComboBox& rAlignLB)
{
sal_uInt16 nMapPos = 0;
int nLBSelPos = rAlignLB.get_active();
@@ -1621,7 +1621,7 @@ void SvxSwPosSizeTabPage::UpdateExample()
}
void SvxSwPosSizeTabPage::FillRelLB(FrmMap const *pMap, sal_uInt16 nMapPos, sal_uInt16 nAlign,
- sal_uInt16 nRel, weld::ComboBoxText& rLB, weld::Label& rFT)
+ sal_uInt16 nRel, weld::ComboBox& rLB, weld::Label& rFT)
{
OUString sSelEntry;
LB nLBRelations = LB::NONE;
@@ -1761,7 +1761,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap const *pMap, sal_uInt16 nMapPos, sal_
sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap const *_pMap,
sal_uInt16 _nAlign,
const sal_uInt16 _nRel,
- weld::ComboBoxText& _rLB)
+ weld::ComboBox& _rLB)
{
OUString sSelEntry, sOldEntry;
sOldEntry = _rLB.get_active_text();
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index ac79e3607893..749fe4781184 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -90,7 +90,7 @@ SvxTextAnimationPage::SvxTextAnimationPage(TabPageParent pPage, const SfxItemSet
, m_aLeftState(TRISTATE_INDET)
, m_aRightState(TRISTATE_INDET)
, m_aDownState(TRISTATE_INDET)
- , m_xLbEffect(m_xBuilder->weld_combo_box_text("LB_EFFECT"))
+ , m_xLbEffect(m_xBuilder->weld_combo_box("LB_EFFECT"))
, m_xBoxDirection(m_xBuilder->weld_widget("boxDIRECTION"))
, m_xBtnUp(m_xBuilder->weld_toggle_button("BTN_UP"))
, m_xBtnLeft(m_xBuilder->weld_toggle_button("BTN_LEFT"))
@@ -433,7 +433,7 @@ VclPtr<SfxTabPage> SvxTextAnimationPage::Create(TabPageParent pParent, const Sfx
return VclPtr<SvxTextAnimationPage>::Create(pParent, *rAttrs);
}
-IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, weld::ComboBox&, void)
{
int nPos = m_xLbEffect->get_active();
if (nPos != -1)
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index c7e71b665820..952ca4393393 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -78,18 +78,18 @@ SvxBitmapTabPage::SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInA
, m_rXFSet(m_aXFillAttr.GetItemSet())
, mpView(nullptr)
, m_xBitmapLB(new PresetListBox(m_xBuilder->weld_scrolled_window("bitmapwin")))
- , m_xBitmapStyleLB(m_xBuilder->weld_combo_box_text("bitmapstyle"))
+ , m_xBitmapStyleLB(m_xBuilder->weld_combo_box("bitmapstyle"))
, m_xSizeBox(m_xBuilder->weld_container("sizebox"))
, m_xTsbScale(m_xBuilder->weld_check_button("scaletsb"))
, m_xBitmapWidth(m_xBuilder->weld_metric_spin_button("width", FUNIT_PERCENT))
, m_xBitmapHeight(m_xBuilder->weld_metric_spin_button("height", FUNIT_PERCENT))
, m_xPositionBox(m_xBuilder->weld_container("posbox"))
- , m_xPositionLB(m_xBuilder->weld_combo_box_text("positionlb"))
+ , m_xPositionLB(m_xBuilder->weld_combo_box("positionlb"))
, m_xPositionOffBox(m_xBuilder->weld_container("posoffbox"))
, m_xPositionOffX(m_xBuilder->weld_metric_spin_button("posoffx", FUNIT_PERCENT))
, m_xPositionOffY(m_xBuilder->weld_metric_spin_button("posoffy", FUNIT_PERCENT))
, m_xTileOffBox(m_xBuilder->weld_container("tileoffbox"))
- , m_xTileOffLB(m_xBuilder->weld_combo_box_text("tileofflb"))
+ , m_xTileOffLB(m_xBuilder->weld_combo_box("tileofflb"))
, m_xTileOffset(m_xBuilder->weld_metric_spin_button("tileoffmtr", FUNIT_PERCENT))
, m_xBtnImport(m_xBuilder->weld_button("BTN_IMPORT"))
, m_xCtlBitmapPreview(new weld::CustomWeld(*m_xBuilder, "CTL_BITMAP_PREVIEW", m_aCtlBitmapPreview))
@@ -621,7 +621,7 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ClickScaleHdl, weld::Button&, void )
ModifyBitmapStyleHdl( *m_xBitmapStyleLB );
}
-IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapStyleHdl, weld::ComboBoxText&, void )
+IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapStyleHdl, weld::ComboBox&, void )
{
BitmapStyle eStylePos = static_cast<BitmapStyle>(m_xBitmapStyleLB->get_active());
bool bIsStretched( eStylePos == STRETCHED );
@@ -667,7 +667,7 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapStyleHdl, weld::ComboBoxText&, vo
m_aCtlBitmapPreview.Invalidate();
}
-IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapPositionHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapPositionHdl, weld::ComboBox&, void)
{
if (m_xPositionLB->get_sensitive())
m_rXFSet.Put( XFillBmpPosItem( static_cast< RectPoint >( m_xPositionLB->get_active() ) ) );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index f5449bcbd09b..a4ef2e444ddb 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -66,7 +66,7 @@ SvxColorTabPage::SvxColorTabPage(TabPageParent pParent, const SfxItemSet& rInAtt
, m_context(comphelper::getProcessComponentContext())
, m_xValSetColorList(new ColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin")))
, m_xValSetRecentList(new ColorValueSet(nullptr))
- , m_xSelectPalette(m_xBuilder->weld_combo_box_text("paletteselector"))
+ , m_xSelectPalette(m_xBuilder->weld_combo_box("paletteselector"))
, m_xRbRGB(m_xBuilder->weld_radio_button("RGB"))
, m_xRbCMYK(m_xBuilder->weld_radio_button("CMYK"))
, m_xRGBcustom(m_xBuilder->weld_widget("rgbcustom"))
@@ -441,7 +441,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, weld::Button&, void)
}
}
-IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, weld::ComboBoxText&, void)
+IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, weld::ComboBox&, void)
{
m_xValSetColorList->Clear();
sal_Int32 nPos = m_xSelectPalette->get_active();
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 42d1ab3096a9..791625ee09bf 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -56,7 +56,7 @@ SvxGradientTabPage::SvxGradientTabPage(TabPageParent pParent, const SfxItemSet&
, m_pnColorListState(nullptr)
, m_aXFillAttr(rInAttrs.GetPool())
, m_rXFSet(m_aXFillAttr.GetItemSet())
- , m_xLbGradientType(m_xBuilder->weld_combo_box_text("gradienttypelb"))
+ , m_xLbGradientType(m_xBuilder->weld_combo_box("gradienttypelb"))
, m_xFtCenter(m_xBuilder->weld_label("centerft"))
, m_xMtrCenterX(m_xBuilder->weld_metric_spin_button("centerxmtr", FUNIT_PERCENT))
, m_xMtrCenterY(m_xBuilder->weld_metric_spin_button("centerymtr", FUNIT_PERCENT))
@@ -101,7 +101,7 @@ SvxGradientTabPage::SvxGradientTabPage(TabPageParent pParent, const SfxItemSet&
m_xBtnModify->connect_clicked(LINK(this, SvxGradientTabPage, ClickModifyHdl_Impl));
Link<weld::MetricSpinButton&,void> aLink = LINK( this, SvxGradientTabPage, ModifiedMetricHdl_Impl );
- Link<weld::ComboBoxText&,void> aLink2 = LINK( this, SvxGradientTabPage, ModifiedListBoxHdl_Impl );
+ Link<weld::ComboBox&,void> aLink2 = LINK( this, SvxGradientTabPage, ModifiedListBoxHdl_Impl );
m_xLbGradientType->connect_changed( aLink2 );
m_xCbIncrement->connect_toggled(LINK(this, SvxGradientTabPage, ChangeAutoStepHdl_Impl));
m_xMtrIncrement->connect_value_changed(LINK(this, SvxGradientTabPage, ModifiedEditHdl_Impl));
@@ -249,7 +249,7 @@ VclPtr<SfxTabPage> SvxGradientTabPage::Create( TabPageParent pWindow,
return VclPtr<SvxGradientTabPage>::Create(pWindow, *rOutAttrs);
}
-IMPL_LINK( SvxGradientTabPage, ModifiedListBoxHdl_Impl, weld::ComboBoxText&, rListBox, void )
+IMPL_LINK( SvxGradientTabPage, ModifiedListBoxHdl_Impl, weld::ComboBox&, rListBox, void )
{
ModifiedHdl_Impl(&rListBox);
// gradient params changed, it is no longer one of the presets
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 162c0134d750..959d1de3e86b 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -59,7 +59,7 @@ SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAtt
, m_xMtrDistance(m_xBuilder->weld_metric_spin_button("distancemtr", FUNIT_MM))
, m_xMtrAngle(m_xBuilder->weld_metric_spin_button("anglemtr", FUNIT_DEGREE))
, m_xSliderAngle(m_xBuilder->weld_scale("angleslider"))
- , m_xLbLineType(m_xBuilder->weld_combo_box_text("linetypelb"))
+ , m_xLbLineType(m_xBuilder->weld_combo_box("linetypelb"))
, m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pParent.GetFrameWeld()))
, m_xCbBackgroundColor(m_xBuilder->weld_check_button("backgroundcolor"))
, m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("backgroundcolorlb"), pParent.GetFrameWeld()))
@@ -103,7 +103,7 @@ SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAtt
m_xHatchLB->SetDeleteHdl( LINK( this, SvxHatchTabPage, ClickDeleteHdl_Impl ) );
Link<weld::MetricSpinButton&,void> aLink = LINK( this, SvxHatchTabPage, ModifiedEditHdl_Impl );
- Link<weld::ComboBoxText&,void> aLink2 = LINK( this, SvxHatchTabPage, ModifiedListBoxHdl_Impl );
+ Link<weld::ComboBox&,void> aLink2 = LINK( this, SvxHatchTabPage, ModifiedListBoxHdl_Impl );
m_xMtrDistance->connect_value_changed( aLink );
m_xMtrAngle->connect_value_changed( aLink );
m_xSliderAngle->connect_value_changed(LINK(this, SvxHatchTabPage, ModifiedSliderHdl_Impl));
@@ -284,7 +284,7 @@ VclPtr<SfxTabPage> SvxHatchTabPage::Create( TabPageParent pWindow,
return VclPtr<SvxHatchTabPage>::Create(pWindow, *rSet);
}
-IMPL_LINK( SvxHatchTabPage, ModifiedListBoxHdl_Impl, weld::ComboBoxText&, rListBox, void )
+IMPL_LINK( SvxHatchTabPage, ModifiedListBoxHdl_Impl, weld::ComboBox&, rListBox, void )
{
ModifiedHdl_Impl(&rListBox);
// hatch params have changed, it is no longer one of the presets
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index d0799155c98a..d974edc9cb7b 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -114,7 +114,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ModifyTransparentHdl_Impl, weld::MetricS
InvalidatePreview();
}
-IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrListBoxHdl_Impl, weld::ComboBoxText&, rListBox, void)
+IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrListBoxHdl_Impl, weld::ComboBox&, rListBox, void)
{
ModifiedTrgrHdl_Impl(&rListBox);
}
@@ -124,7 +124,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ModifiedTrgrEditHdl_Impl, weld::MetricSp
ModifiedTrgrHdl_Impl(nullptr);
}
-void SvxTransparenceTabPage::ModifiedTrgrHdl_Impl(const weld::ComboBoxText* pControl)
+void SvxTransparenceTabPage::ModifiedTrgrHdl_Impl(const weld::ComboBox* pControl)
{
if (pControl == m_xLbTrgrGradientType.get())
{
@@ -213,7 +213,7 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(TabPageParent pParent, const SfxI
, m_xRbtTransGradient(m_xBuilder->weld_radio_button("RBT_TRANS_GRADIENT"))
, m_xMtrTransparent(m_xBuilder->weld_metric_spin_button("MTR_TRANSPARENT", FUNIT_PERCENT))
, m_xGridGradient(m_xBuilder->weld_widget("gridGradient"))
- , m_xLbTrgrGradientType(m_xBuilder->weld_combo_box_text("LB_TRGR_GRADIENT_TYPES"))
+ , m_xLbTrgrGradientType(m_xBuilder->weld_combo_box("LB_TRGR_GRADIENT_TYPES"))
, m_xFtTrgrCenterX(m_xBuilder->weld_label("FT_TRGR_CENTER_X"))
, m_xMtrTrgrCenterX(m_xBuilder->weld_metric_spin_button("MTR_TRGR_CENTER_X", FUNIT_PERCENT))
, m_xFtTrgrCenterY(m_xBuilder->weld_label("FT_TRGR_CENTER_Y"))
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index bbedad6c6f80..b4ff929d34d6 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -462,12 +462,12 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(TabPageParent pParent, const SfxItemS
, mxQualityFrame(m_xBuilder->weld_widget("qualityframe"))
, mxNfQuality(m_xBuilder->weld_metric_spin_button("quality", FUNIT_PERCENT))
, mxCbReduceImageResolution(m_xBuilder->weld_check_button("reduceresolution"))
- , mxCoReduceImageResolution(m_xBuilder->weld_combo_box_text("resolution"))
+ , mxCoReduceImageResolution(m_xBuilder->weld_combo_box("resolution"))
, mxCbPDFA1b(m_xBuilder->weld_check_button("pdfa"))
, mxCbTaggedPDF(m_xBuilder->weld_check_button("tagged"))
, mxCbExportFormFields(m_xBuilder->weld_check_button("forms"))
, mxFormsFrame(m_xBuilder->weld_widget("formsframe"))
- , mxLbFormsFormat(m_xBuilder->weld_combo_box_text("format"))
+ , mxLbFormsFormat(m_xBuilder->weld_combo_box("format"))
, mxCbAllowDuplicateFieldNames(m_xBuilder->weld_check_button("allowdups"))
, mxCbExportBookmarks(m_xBuilder->weld_check_button("bookmarks"))
, mxCbExportHiddenSlides(m_xBuilder->weld_check_button("hiddenpages"))
@@ -1458,7 +1458,7 @@ ImpPDFTabSigningPage::ImpPDFTabSigningPage(TabPageParent pParent, const SfxItemS
, mxEdSignLocation(m_xBuilder->weld_entry("location"))
, mxEdSignContactInfo(m_xBuilder->weld_entry("contact"))
, mxEdSignReason(m_xBuilder->weld_entry("reason"))
- , mxLBSignTSA(m_xBuilder->weld_combo_box_text("tsa"))
+ , mxLBSignTSA(m_xBuilder->weld_combo_box("tsa"))
{
mxPbSignCertSelect->set_sensitive(true);
mxPbSignCertSelect->connect_clicked(LINK(this, ImpPDFTabSigningPage, ClickmaPbSignCertSelect));
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index b2b0073a0775..32ce705a0ca7 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -189,12 +189,12 @@ class ImpPDFTabGeneralPage : public SfxTabPage
std::unique_ptr<weld::Widget> mxQualityFrame;
std::unique_ptr<weld::MetricSpinButton> mxNfQuality;
std::unique_ptr<weld::CheckButton> mxCbReduceImageResolution;
- std::unique_ptr<weld::ComboBoxText> mxCoReduceImageResolution;
+ std::unique_ptr<weld::ComboBox> mxCoReduceImageResolution;
std::unique_ptr<weld::CheckButton> mxCbPDFA1b;
std::unique_ptr<weld::CheckButton> mxCbTaggedPDF;
std::unique_ptr<weld::CheckButton> mxCbExportFormFields;
std::unique_ptr<weld::Widget> mxFormsFrame;
- std::unique_ptr<weld::ComboBoxText> mxLbFormsFormat;
+ std::unique_ptr<weld::ComboBox> mxLbFormsFormat;
std::unique_ptr<weld::CheckButton> mxCbAllowDuplicateFieldNames;
std::unique_ptr<weld::CheckButton> mxCbExportBookmarks;
std::unique_ptr<weld::CheckButton> mxCbExportHiddenSlides;
@@ -394,7 +394,7 @@ class ImpPDFTabSigningPage : public SfxTabPage
std::unique_ptr<weld::Entry> mxEdSignLocation;
std::unique_ptr<weld::Entry> mxEdSignContactInfo;
std::unique_ptr<weld::Entry> mxEdSignReason;
- std::unique_ptr<weld::ComboBoxText> mxLBSignTSA;
+ std::unique_ptr<weld::ComboBox> mxLBSignTSA;
DECL_LINK(ClickmaPbSignCertSelect, weld::Button&, void);
DECL_LINK(ClickmaPbSignCertClear, weld::Button&, void);
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
index 69bb87882fa6..7b6e519c813f 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
@@ -27,7 +27,7 @@ XMLFilterTabPageBasic::XMLFilterTabPageBasic(weld::Widget* pPage)
: m_xBuilder(Application::CreateBuilder(pPage, "filter/ui/xmlfiltertabpagegeneral.ui"))
, m_xContainer(m_xBuilder->weld_widget("XmlFilterTabPageGeneral"))
, m_xEDFilterName(m_xBuilder->weld_entry("filtername"))
- , m_xCBApplication(m_xBuilder->weld_combo_box_text("application"))
+ , m_xCBApplication(m_xBuilder->weld_combo_box("application"))
, m_xEDInterfaceName(m_xBuilder->weld_entry("interfacename"))
, m_xEDExtension(m_xBuilder->weld_entry("extension"))
, m_xEDDescription(m_xBuilder->weld_text_view("description"))
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
index 22e2787ac554..e3b96e51550c 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
@@ -35,7 +35,7 @@ public:
std::unique_ptr<weld::Builder> m_xBuilder;
std::unique_ptr<weld::Widget> m_xContainer;
std::unique_ptr<weld::Entry> m_xEDFilterName;
- std::unique_ptr<weld::ComboBoxText> m_xCBApplication;
+ std::unique_ptr<weld::ComboBox> m_xCBApplication;
std::unique_ptr<weld::Entry> m_xEDInterfaceName;
std::unique_ptr<weld::Entry> m_xEDExtension;
std::unique_ptr<weld::TextView> m_xEDDescription;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 6c5a12db9b3e..51081a5d5063 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -36,11 +36,11 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT(weld::Widget* pPage, weld::Dialog* pD
, m_xBuilder(Application::CreateBuilder(pPage, "filter/ui/xmlfiltertabpagetransformation.ui"))
, m_xContainer(m_xBuilder->weld_widget("XmlFilterTabPageTransformation"))
, m_xEDDocType(m_xBuilder->weld_entry("doc"))
- , m_xEDExportXSLT(new URLBox(m_xBuilder->weld_combo_box_text("xsltexport")))
+ , m_xEDExportXSLT(new URLBox(m_xBuilder->weld_combo_box("xsltexport")))
, m_xPBExprotXSLT(m_xBuilder->weld_button("browseexport"))
- , m_xEDImportXSLT(new URLBox(m_xBuilder->weld_combo_box_text("xsltimport")))
+ , m_xEDImportXSLT(new URLBox(m_xBuilder->weld_combo_box("xsltimport")))
, m_xPBImportXSLT(m_xBuilder->weld_button("browseimport"))
- , m_xEDImportTemplate(new URLBox(m_xBuilder->weld_combo_box_text("tempimport")))
+ , m_xEDImportTemplate(new URLBox(m_xBuilder->weld_combo_box("tempimport")))
, m_xPBImportTemplate(m_xBuilder->weld_button("browsetemp"))
, m_xCBNeedsXSLT2(m_xBuilder->weld_check_button("filtercb"))
{
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index d63b1a05ed0a..b0ea05e2ee87 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -52,13 +52,13 @@ class SfxManageStyleSheetPage final : public SfxTabPage
std::unique_ptr<weld::Entry> m_xName;
std::unique_ptr<weld::CheckButton> m_xAutoCB;
std::unique_ptr<weld::Label> m_xFollowFt;
- std::unique_ptr<weld::ComboBoxText> m_xFollowLb;
+ std::unique_ptr<weld::ComboBox> m_xFollowLb;
std::unique_ptr<weld::Button> m_xEditStyleBtn;
std::unique_ptr<weld::Label> m_xBaseFt;
- std::unique_ptr<weld::ComboBoxText> m_xBaseLb;
+ std::unique_ptr<weld::ComboBox> m_xBaseLb;
std::unique_ptr<weld::Button> m_xEditLinkStyleBtn;
std::unique_ptr<weld::Label> m_xFilterFt;
- std::unique_ptr<weld::ComboBoxText> m_xFilterLb;
+ std::unique_ptr<weld::ComboBox> m_xFilterLb;
std::unique_ptr<weld::Label> m_xDescFt;
std::unique_ptr<weld::Label> m_xNameFt;
@@ -67,12 +67,12 @@ friend class SfxStyleDialogController;
DECL_LINK(GetFocusHdl, weld::Widget&, void);
DECL_LINK(LoseFocusHdl, weld::Widget&, void);
- DECL_LINK(EditStyleSelectHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(EditStyleSelectHdl_Impl, weld::ComboBox&, void);
DECL_LINK(EditStyleHdl_Impl, weld::Button&, void);
- DECL_LINK(EditLinkStyleSelectHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(EditLinkStyleSelectHdl_Impl, weld::ComboBox&, void);
DECL_LINK(EditLinkStyleHdl_Impl, weld::Button&, void);
- void UpdateName_Impl(weld::ComboBoxText*, const OUString &rNew);
+ void UpdateName_Impl(weld::ComboBox*, const OUString &rNew);
void SetDescriptionText_Impl();
virtual ~SfxManageStyleSheetPage() override;
diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index 5cd9e24b41e7..8e7489881c47 100644
--- a/include/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
@@ -38,7 +38,7 @@ private:
DECL_DLLPRIVATE_LINK(OKHdl, weld::TreeView&, void);
DECL_DLLPRIVATE_LINK(OKClickHdl, weld::Button&, void);
- DECL_DLLPRIVATE_LINK(ModifyHdl, weld::ComboBoxText&, void);
+ DECL_DLLPRIVATE_LINK(ModifyHdl, weld::ComboBox&, void);
public:
SfxNewStyleDlg(weld::Window* pParent, SfxStyleSheetBasePool&);
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
diff --git a/include/svx/SvxNumOptionsTabPageHelper.hxx b/include/svx/SvxNumOptionsTabPageHelper.hxx
index 0b9d5040440b..ada89f794840 100644
--- a/include/svx/SvxNumOptionsTabPageHelper.hxx
+++ b/include/svx/SvxNumOptionsTabPageHelper.hxx
@@ -46,7 +46,7 @@ public:
restriction.
*/
static void GetI18nNumbering(ListBox& rFmtLB, sal_uInt16 nDoNotRemove);
- static void GetI18nNumbering(weld::ComboBoxText& rFmtLB, sal_uInt16 nDoNotRemove);
+ static void GetI18nNumbering(weld::ComboBox& rFmtLB, sal_uInt16 nDoNotRemove);
};
#endif
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 02f77a979f34..22682a967240 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -124,7 +124,7 @@ private:
std::unique_ptr<ColorValueSet> mxColorSet;
std::unique_ptr<ColorValueSet> mxRecentColorSet;
std::unique_ptr<weld::Container> mxTopLevel;
- std::unique_ptr<weld::ComboBoxText> mxPaletteListBox;
+ std::unique_ptr<weld::ComboBox> mxPaletteListBox;
std::unique_ptr<weld::Button> mxButtonAutoColor;
std::unique_ptr<weld::Button> mxButtonNoneColor;
std::unique_ptr<weld::Button> mxButtonPicker;
@@ -133,7 +133,7 @@ private:
std::unique_ptr<weld::CustomWeld> mxRecentColorSetWin;
DECL_LINK(SelectHdl, SvtValueSet*, void);
- DECL_LINK(SelectPaletteHdl, weld::ComboBoxText&, void);
+ DECL_LINK(SelectPaletteHdl, weld::ComboBox&, void);
DECL_LINK(AutoColorClickHdl, weld::Button&, void);
DECL_LINK(OpenPickerClickHdl, weld::Button&, void);
DECL_LINK(FocusHdl, weld::Widget&, void);
diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx
index ca907aefcede..e9e64a15f443 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -43,7 +43,7 @@ private:
std::unique_ptr<weld::CheckButton> m_xReduceResolutionCB;
std::unique_ptr<weld::SpinButton> m_xMFNewWidth;
std::unique_ptr<weld::SpinButton> m_xMFNewHeight;
- std::unique_ptr<weld::ComboBoxText> m_xResolutionLB;
+ std::unique_ptr<weld::ComboBox> m_xResolutionLB;
std::unique_ptr<weld::RadioButton> m_xLosslessRB;
std::unique_ptr<weld::RadioButton> m_xJpegCompRB;
std::unique_ptr<weld::SpinButton> m_xCompressionMF;
@@ -51,7 +51,7 @@ private:
std::unique_ptr<weld::SpinButton> m_xQualityMF;
std::unique_ptr<weld::Scale> m_xQualitySlider;
std::unique_ptr<weld::Button> m_xBtnCalculate;
- std::unique_ptr<weld::ComboBoxText> m_xInterpolationCombo;
+ std::unique_ptr<weld::ComboBox> m_xInterpolationCombo;
SdrGrafObj* m_xGraphicObj;
Graphic m_aGraphic;
@@ -64,12 +64,12 @@ private:
void Initialize();
DECL_LINK( SlideHdl, weld::Scale&, void );
- DECL_LINK( NewInterpolationModifiedHdl, weld::ComboBoxText&, void );
+ DECL_LINK( NewInterpolationModifiedHdl, weld::ComboBox&, void );
DECL_LINK( NewQualityModifiedHdl, weld::Entry&, void );
DECL_LINK( NewCompressionModifiedHdl, weld::Entry&, void );
DECL_LINK( NewWidthModifiedHdl, weld::Entry&, void );
DECL_LINK( NewHeightModifiedHdl, weld::Entry&, void );
- DECL_LINK( ResolutionModifiedHdl, weld::ComboBoxText&, void );
+ DECL_LINK( ResolutionModifiedHdl, weld::ComboBox&, void );
DECL_LINK( ToggleCompressionRB, weld::ToggleButton&, void );
DECL_LINK( ToggleReduceResolutionRB, weld::ToggleButton&, void );
diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index 405065199da9..62d374e06a13 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -56,9 +56,9 @@ public:
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFrameDirectionListBox
{
private:
- std::unique_ptr<weld::ComboBoxText> m_xControl;
+ std::unique_ptr<weld::ComboBox> m_xControl;
public:
- explicit SvxFrameDirectionListBox(std::unique_ptr<weld::ComboBoxText> pControl)
+ explicit SvxFrameDirectionListBox(std::unique_ptr<weld::ComboBox> pControl)
: m_xControl(std::move(pControl))
{
}
@@ -77,7 +77,7 @@ public:
{
m_xControl->append(OUString::number(static_cast<sal_uInt32>(eDirection)), rString);
}
- void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_xControl->connect_changed(rLink); }
+ void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); }
};
/** Wrapper for usage of a FrameDirectionListBox in item connections. */
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index c83ba9609565..56ef1e7129d6 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -203,7 +203,7 @@ public:
SAL_DLLPRIVATE SvStream& WriteData( SvStream& rOut ) const;
SAL_DLLPRIVATE SvStream& ReadData( SvStream& rIn );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list