diff options
Diffstat (limited to 'cui/source')
31 files changed, 186 insertions, 186 deletions
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")) |