diff options
159 files changed, 756 insertions, 763 deletions
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 ); - static void InsertAllThemes(weld::ComboBoxText& rListBox); + static void InsertAllThemes(weld::ComboBox& rListBox); // for buffering PreviewBitmaps and strings for object and path SAL_DLLPRIVATE void GetPreviewBitmapExAndStrings(sal_uInt32 nPos, BitmapEx& rBitmapEx, Size& rSize, OUString& rTitle, OUString& rPath) const; diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 3ce7a3e43554..2dabd4112a24 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -158,8 +158,8 @@ public: }; private: - std::unique_ptr<weld::ComboBoxText> m_xControl; - Link<weld::ComboBoxText&, void> m_aChangeHdl; + std::unique_ptr<weld::ComboBox> m_xControl; + Link<weld::ComboBox&, void> m_aChangeHdl; OUString m_aAllString; std::unique_ptr<css::uno::Sequence<sal_Int16>> m_xSpellUsedLang; LanguageType m_eSavedLanguage; @@ -170,9 +170,9 @@ private: SVX_DLLPRIVATE int ImplTypeToPos(LanguageType eType) const; SVX_DLLPRIVATE void ImplClear(); - DECL_LINK(ChangeHdl, weld::ComboBoxText&, void); + DECL_LINK(ChangeHdl, weld::ComboBox&, void); public: - LanguageBox(std::unique_ptr<weld::ComboBoxText> pControl); + LanguageBox(std::unique_ptr<weld::ComboBox> pControl); void SetLanguageList( SvxLanguageListFlags nLangList, bool bHasLangNone, bool bLangNoneIsLangAll = false, bool bCheckSpellAvail = false ); @@ -182,7 +182,7 @@ public: EditedAndValid GetEditedAndValid() const { return m_eEditedAndValid;} sal_Int32 SaveEditedAsEntry(); - void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_aChangeHdl = rLink; } + void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_aChangeHdl = rLink; } void save_active_id() { m_eSavedLanguage = get_active_id(); } LanguageType get_saved_active_id() const { return m_eSavedLanguage; } bool get_active_id_changed_from_saved() const { return m_eSavedLanguage != get_active_id(); } diff --git a/include/svx/pagenumberlistbox.hxx b/include/svx/pagenumberlistbox.hxx index 51cc94e53a81..c469f4e9ced9 100644 --- a/include/svx/pagenumberlistbox.hxx +++ b/include/svx/pagenumberlistbox.hxx @@ -37,16 +37,16 @@ public: class SVX_DLLPUBLIC SvxPageNumberListBox { private: - std::unique_ptr<weld::ComboBoxText> m_xControl; + std::unique_ptr<weld::ComboBox> m_xControl; public: - SvxPageNumberListBox(std::unique_ptr<weld::ComboBoxText> pControl); + SvxPageNumberListBox(std::unique_ptr<weld::ComboBox> pControl); int get_count() const { return m_xControl->get_count(); } OUString get_id(int pos) const { return m_xControl->get_id(pos); } int get_active() const { return m_xControl->get_active(); } void set_active(int pos) { m_xControl->set_active(pos); } void save_value() { m_xControl->save_value(); } bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); } - weld::ComboBoxText& get_widget() const { return *m_xControl; } + weld::ComboBox& get_widget() const { return *m_xControl; } }; #endif diff --git a/include/svx/papersizelistbox.hxx b/include/svx/papersizelistbox.hxx index 0ba2de17ccf5..e8a393fc0063 100644 --- a/include/svx/papersizelistbox.hxx +++ b/include/svx/papersizelistbox.hxx @@ -46,20 +46,20 @@ public: class SVX_DLLPUBLIC SvxPaperSizeListBox { private: - std::unique_ptr<weld::ComboBoxText> m_xControl; + std::unique_ptr<weld::ComboBox> m_xControl; public: - SvxPaperSizeListBox(std::unique_ptr<weld::ComboBoxText> pControl); + SvxPaperSizeListBox(std::unique_ptr<weld::ComboBox> pControl); void FillPaperSizeEntries(PaperSizeApp eApp); void SetSelection(Paper eSize); Paper GetSelection() const; - 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); } void clear() { m_xControl->clear(); } void save_value() { return m_xControl->save_value(); } bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); } - weld::ComboBoxText& get_widget() const { return *m_xControl; } + weld::ComboBox& get_widget() const { return *m_xControl; } }; #endif diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index 294362cc5f85..4cf66c7c1641 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -92,10 +92,10 @@ public: class SVX_DLLPUBLIC TextEncodingBox { private: - std::unique_ptr<weld::ComboBoxText> m_xControl; + std::unique_ptr<weld::ComboBox> m_xControl; public: - TextEncodingBox(std::unique_ptr<weld::ComboBoxText> pControl); + TextEncodingBox(std::unique_ptr<weld::ComboBox> pControl); ~TextEncodingBox(); @@ -125,7 +125,7 @@ public: rtl_TextEncoding GetSelectTextEncoding() const; - 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); } }; diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index b5fac32ca461..1857033f5929 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -243,14 +243,14 @@ public: virtual Container* weld_message_area() = 0; }; -class VCL_DLLPUBLIC ComboBoxText : virtual public Container +class VCL_DLLPUBLIC ComboBox : virtual public Container { private: OUString m_sSavedValue; protected: - Link<ComboBoxText&, void> m_aChangeHdl; - Link<ComboBoxText&, void> m_aEntryActivateHdl; + Link<ComboBox&, void> m_aChangeHdl; + Link<ComboBox&, void> m_aEntryActivateHdl; void signal_changed() { m_aChangeHdl.Call(*this); } @@ -288,7 +288,7 @@ public: virtual int find_id(const OUString& rId) const = 0; void remove_id(const OUString& rId) { remove(find_id(rId)); } - void connect_changed(const Link<ComboBoxText&, void>& rLink) { m_aChangeHdl = rLink; } + void connect_changed(const Link<ComboBox&, void>& rLink) { m_aChangeHdl = rLink; } //entry related virtual bool has_entry() const = 0; @@ -299,10 +299,7 @@ public: virtual bool get_entry_selection_bounds(int& rStartPos, int& rEndPos) = 0; virtual void set_entry_completion(bool bEnable) = 0; - void connect_entry_activate(const Link<ComboBoxText&, void>& rLink) - { - m_aEntryActivateHdl = rLink; - } + void connect_entry_activate(const Link<ComboBox&, void>& rLink) { m_aEntryActivateHdl = rLink; } void save_value() { m_sSavedValue = get_active_text(); } OUString const& get_saved_value() const { return m_sSavedValue; } @@ -599,7 +596,7 @@ public: // an entry + treeview pair, where the entry autocompletes from the // treeview list, and selecting something in the list sets the // entry to that text, i.e. a visually exploded ComboBox -class VCL_DLLPUBLIC EntryTreeView : virtual public ComboBoxText +class VCL_DLLPUBLIC EntryTreeView : virtual public ComboBox { private: DECL_DLLPRIVATE_LINK(ClickHdl, weld::TreeView&, void); @@ -1067,8 +1064,7 @@ public: virtual std::unique_ptr<TimeSpinButton> weld_time_spin_button(const OString& id, TimeFieldFormat eFormat, bool bTakeOwnership = false) = 0; - virtual std::unique_ptr<ComboBoxText> weld_combo_box_text(const OString& id, - bool bTakeOwnership = false) + virtual std::unique_ptr<ComboBox> weld_combo_box(const OString& id, bool bTakeOwnership = false) = 0; virtual std::unique_ptr<TreeView> weld_tree_view(const OString& id, bool bTakeOwnership = false) = 0; diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 69f5cd531e05..3b4af89387d8 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -48,10 +48,10 @@ ODateTimeDialog::ODateTimeDialog(weld::Window* _pParent, const uno::Reference< r , m_xHoldAlive(_xHoldAlive) , m_xDate(m_xBuilder->weld_check_button("date")) , m_xFTDateFormat(m_xBuilder->weld_label("datelistbox_label")) - , m_xDateListBox(m_xBuilder->weld_combo_box_text("datelistbox")) + , m_xDateListBox(m_xBuilder->weld_combo_box("datelistbox")) , m_xTime(m_xBuilder->weld_check_button("time")) , m_xFTTimeFormat(m_xBuilder->weld_label("timelistbox_label")) - , m_xTimeListBox(m_xBuilder->weld_combo_box_text("timelistbox")) + , m_xTimeListBox(m_xBuilder->weld_combo_box("timelistbox")) , m_xPB_OK(m_xBuilder->weld_button("ok")) { try @@ -77,7 +77,7 @@ ODateTimeDialog::ODateTimeDialog(weld::Window* _pParent, const uno::Reference< r void ODateTimeDialog::InsertEntry(sal_Int16 _nNumberFormatId) { const bool bTime = util::NumberFormat::TIME == _nNumberFormatId; - weld::ComboBoxText* pListBox = m_xDateListBox.get(); + weld::ComboBox* pListBox = m_xDateListBox.get(); if (bTime) pListBox = m_xTimeListBox.get(); diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 0d5953498627..9d31be427b30 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -43,10 +43,10 @@ class ODateTimeDialog : public weld::GenericDialogController std::unique_ptr<weld::CheckButton> m_xDate; std::unique_ptr<weld::Label> m_xFTDateFormat; - std::unique_ptr<weld::ComboBoxText> m_xDateListBox; + std::unique_ptr<weld::ComboBox> m_xDateListBox; std::unique_ptr<weld::CheckButton> m_xTime; std::unique_ptr<weld::Label> m_xFTTimeFormat; - std::unique_ptr<weld::ComboBoxText> m_xTimeListBox; + std::unique_ptr<weld::ComboBox> m_xTimeListBox; std::unique_ptr<weld::Button> m_xPB_OK; /** returns the format string diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index b75b19609916..da0f99c49b86 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -44,9 +44,9 @@ using namespace com::sun::star; ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg(weld::Window* pParent) : GenericDialogController(pParent, "modules/scalc/ui/selectdatasource.ui", "SelectDataSourceDialog") - , m_xLbDatabase(m_xBuilder->weld_combo_box_text("database")) - , m_xCbObject(m_xBuilder->weld_combo_box_text("datasource")) - , m_xLbType(m_xBuilder->weld_combo_box_text("type")) + , m_xLbDatabase(m_xBuilder->weld_combo_box("database")) + , m_xCbObject(m_xBuilder->weld_combo_box("datasource")) + , m_xLbType(m_xBuilder->weld_combo_box("type")) { weld::WaitObject aWait(pParent); // initializing the database service the first time takes a while @@ -102,7 +102,7 @@ void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc ) rDesc.bNative = ( nSelect == DP_TYPELIST_SQLNAT ); } -IMPL_LINK_NOARG(ScDataPilotDatabaseDlg, SelectHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(ScDataPilotDatabaseDlg, SelectHdl, weld::ComboBox&, void) { FillObjects(); } diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index b51d27bc3849..b8ae9754d056 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -30,7 +30,7 @@ ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(weld::Window* pParent, bool b , m_xBtnNamedRange(m_xBuilder->weld_radio_button("namedrange")) , m_xBtnDatabase(m_xBuilder->weld_radio_button("database")) , m_xBtnExternal(m_xBuilder->weld_radio_button("external")) - , m_xLbNamedRange(m_xBuilder->weld_combo_box_text("rangelb")) + , m_xLbNamedRange(m_xBuilder->weld_combo_box("rangelb")) { m_xBtnSelection->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) ); m_xBtnNamedRange->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) ); @@ -92,7 +92,7 @@ IMPL_LINK_NOARG(ScDataPilotSourceTypeDlg, RadioClickHdl, weld::ToggleButton&, vo ScDataPilotServiceDlg::ScDataPilotServiceDlg(weld::Window* pParent, const std::vector<OUString>& rServices) : GenericDialogController(pParent, "modules/scalc/ui/dapiservicedialog.ui", "DapiserviceDialog") - , m_xLbService(m_xBuilder->weld_combo_box_text("service")) + , m_xLbService(m_xBuilder->weld_combo_box("service")) , m_xEdSource(m_xBuilder->weld_entry("source")) , m_xEdName(m_xBuilder->weld_entry("name")) , m_xEdUser(m_xBuilder->weld_entry("user")) diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index 4722fd92c49e..670fb4c04de8 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -15,7 +15,7 @@ ScSortKeyItem::ScSortKeyItem(weld::Container* pParent) : m_xBuilder(Application::CreateBuilder(pParent, "modules/scalc/ui/sortkey.ui")) , m_xFrame(m_xBuilder->weld_frame("SortKeyFrame", true)) - , m_xLbSort(m_xBuilder->weld_combo_box_text("sortlb")) + , m_xLbSort(m_xBuilder->weld_combo_box("sortlb")) , m_xBtnUp(m_xBuilder->weld_radio_button("up")) , m_xBtnDown(m_xBuilder->weld_radio_button("down")) { diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index c9b488fa2bcb..72f4b3ccd55c 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -424,7 +424,7 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem ) // Handler: -IMPL_LINK( ScTabPageSortFields, SelectHdl, weld::ComboBoxText&, rLb, void ) +IMPL_LINK( ScTabPageSortFields, SelectHdl, weld::ComboBox&, rLb, void ) { OUString aSelEntry = rLb.get_active_text(); ScSortKeyItems::iterator pIter; @@ -495,13 +495,13 @@ ScTabPageSortOptions::ScTabPageSortOptions(TabPageParent pParent, const SfxItemS , m_xBtnFormats(m_xBuilder->weld_check_button("formats")) , m_xBtnNaturalSort(m_xBuilder->weld_check_button("naturalsort")) , m_xBtnCopyResult(m_xBuilder->weld_check_button("copyresult")) - , m_xLbOutPos(m_xBuilder->weld_combo_box_text("outarealb")) + , m_xLbOutPos(m_xBuilder->weld_combo_box("outarealb")) , m_xEdOutPos(m_xBuilder->weld_entry("outareaed")) , m_xBtnSortUser(m_xBuilder->weld_check_button("sortuser")) - , m_xLbSortUser(m_xBuilder->weld_combo_box_text("sortuserlb")) - , m_xLbLanguage(new LanguageBox(m_xBuilder->weld_combo_box_text("language"))) + , m_xLbSortUser(m_xBuilder->weld_combo_box("sortuserlb")) + , m_xLbLanguage(new LanguageBox(m_xBuilder->weld_combo_box("language"))) , m_xFtAlgorithm(m_xBuilder->weld_label("algorithmft")) - , m_xLbAlgorithm(m_xBuilder->weld_combo_box_text("algorithmlb")) + , m_xLbAlgorithm(m_xBuilder->weld_combo_box("algorithmlb")) , m_xBtnTopDown(m_xBuilder->weld_radio_button("topdown")) , m_xBtnLeftRight(m_xBuilder->weld_radio_button("leftright")) , m_xBtnIncComments(m_xBuilder->weld_check_button("includenotes")) @@ -826,7 +826,7 @@ IMPL_LINK( ScTabPageSortOptions, EnableHdl, weld::ToggleButton&, rButton, void ) } } -IMPL_LINK(ScTabPageSortOptions, SelOutPosHdl, weld::ComboBoxText&, rLb, void) +IMPL_LINK(ScTabPageSortOptions, SelOutPosHdl, weld::ComboBox&, rLb, void) { if (&rLb == m_xLbOutPos.get()) { @@ -907,7 +907,7 @@ void ScTabPageSortOptions::FillAlgor() m_xLbAlgorithm->thaw(); } -IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl, weld::ComboBox&, void) { FillAlgor(); } diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index f916a834af89..27c30e1e9773 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -27,13 +27,13 @@ struct ScImportSourceDesc; class ScDataPilotDatabaseDlg : public weld::GenericDialogController { private: - std::unique_ptr<weld::ComboBoxText> m_xLbDatabase; - std::unique_ptr<weld::ComboBoxText> m_xCbObject; - std::unique_ptr<weld::ComboBoxText> m_xLbType; + std::unique_ptr<weld::ComboBox> m_xLbDatabase; + std::unique_ptr<weld::ComboBox> m_xCbObject; + std::unique_ptr<weld::ComboBox> m_xLbType; void FillObjects(); - DECL_LINK(SelectHdl, weld::ComboBoxText&, void); + DECL_LINK(SelectHdl, weld::ComboBox&, void); public: ScDataPilotDatabaseDlg(weld::Window* pParent); diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 3c1fa4790d3f..2fea18054c62 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -29,7 +29,7 @@ private: std::unique_ptr<weld::RadioButton> m_xBtnNamedRange; std::unique_ptr<weld::RadioButton> m_xBtnDatabase; std::unique_ptr<weld::RadioButton> m_xBtnExternal; - std::unique_ptr<weld::ComboBoxText> m_xLbNamedRange; + std::unique_ptr<weld::ComboBox> m_xLbNamedRange; public: ScDataPilotSourceTypeDlg(weld::Window* pParent, bool bEnableExternal); @@ -47,7 +47,7 @@ private: class ScDataPilotServiceDlg : public weld::GenericDialogController { private: - std::unique_ptr<weld::ComboBoxText> m_xLbService; + std::unique_ptr<weld::ComboBox> m_xLbService; std::unique_ptr<weld::Entry> m_xEdSource; std::unique_ptr<weld::Entry> m_xEdName; std::unique_ptr<weld::Entry> m_xEdUser; diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index b6b2dd2cbaba..e377b30eda94 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -46,7 +46,7 @@ class DataStreamDlg : public weld::GenericDialogController DECL_LINK(UpdateClickHdl, weld::ToggleButton&, void); DECL_LINK(UpdateHdl, weld::Entry&, void); - DECL_LINK(UpdateComboBoxHdl, weld::ComboBoxText&, void); + DECL_LINK(UpdateComboBoxHdl, weld::ComboBox&, void); DECL_LINK(BrowseHdl, weld::Button&, void); void UpdateEnable(); diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 564568419d30..222fe52f3b69 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -44,7 +44,7 @@ private: std::unique_ptr<weld::Label> m_xFtSeconds; std::unique_ptr<weld::Button> m_xBtnOk; - DECL_LINK(FileHdl, weld::ComboBoxText&, void); + DECL_LINK(FileHdl, weld::ComboBox&, void); DECL_LINK(BrowseHdl, weld::Button&, void); DECL_LINK(RangeHdl, weld::TreeView&, void); DECL_LINK(ReloadHdl, weld::Button&, void); diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 8f1acc65f6d3..6c56de77f2fa 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -61,7 +61,7 @@ private: std::unique_ptr<weld::RadioButton> m_xBtnMove; std::unique_ptr<weld::RadioButton> m_xBtnCopy; - std::unique_ptr<weld::ComboBoxText> m_xLbDoc; + std::unique_ptr<weld::ComboBox> m_xLbDoc; std::unique_ptr<weld::TreeView> m_xLbTable; std::unique_ptr<weld::Entry> m_xEdTabName; std::unique_ptr<weld::Label> m_xFtWarn; @@ -73,7 +73,7 @@ private: void Init (); void InitDocListBox (); DECL_LINK(OkHdl, weld::Button&, void); - DECL_LINK(SelHdl, weld::ComboBoxText&, void); + DECL_LINK(SelHdl, weld::ComboBox&, void); DECL_LINK(CheckBtnHdl, weld::ToggleButton&, void); DECL_LINK(CheckNameHdl, weld::Entry&, void); }; diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index bbcf2f8f5aed..396b3be9376c 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -23,7 +23,7 @@ struct ScSortKeyItem std::unique_ptr<weld::Builder> m_xBuilder; std::unique_ptr<weld::Frame> m_xFrame; - std::unique_ptr<weld::ComboBoxText> m_xLbSort; + std::unique_ptr<weld::ComboBox> m_xLbSort; std::unique_ptr<weld::RadioButton> m_xBtnUp; std::unique_ptr<weld::RadioButton> m_xBtnDown; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 469087353e0e..95a7629f7d09 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -90,7 +90,7 @@ private: void SetLastSortKey( sal_uInt16 nItem ); // Handler ------------------------ - DECL_LINK(SelectHdl, weld::ComboBoxText&, void); + DECL_LINK(SelectHdl, weld::ComboBox&, void); DECL_LINK(ScrollToEndHdl, Timer*, void); }; @@ -134,13 +134,13 @@ private: std::unique_ptr<weld::CheckButton> m_xBtnFormats; std::unique_ptr<weld::CheckButton> m_xBtnNaturalSort; std::unique_ptr<weld::CheckButton> m_xBtnCopyResult; - std::unique_ptr<weld::ComboBoxText> m_xLbOutPos; + std::unique_ptr<weld::ComboBox> m_xLbOutPos; std::unique_ptr<weld::Entry> m_xEdOutPos; std::unique_ptr<weld::CheckButton> m_xBtnSortUser; - std::unique_ptr<weld::ComboBoxText> m_xLbSortUser; + std::unique_ptr<weld::ComboBox> m_xLbSortUser; std::unique_ptr<LanguageBox> m_xLbLanguage; std::unique_ptr<weld::Label> m_xFtAlgorithm; - std::unique_ptr<weld::ComboBoxText> m_xLbAlgorithm; + std::unique_ptr<weld::ComboBox> m_xLbAlgorithm; std::unique_ptr<weld::RadioButton> m_xBtnTopDown; std::unique_ptr<weld::RadioButton> m_xBtnLeftRight; std::unique_ptr<weld::CheckButton> m_xBtnIncComments; @@ -152,11 +152,11 @@ private: // Handler ------------------------ DECL_LINK( EnableHdl, weld::ToggleButton&, void ); - DECL_LINK( SelOutPosHdl, weld::ComboBoxText&, void ); + DECL_LINK( SelOutPosHdl, weld::ComboBox&, void ); void EdOutPosModHdl(); DECL_LINK( SortDirHdl, weld::ToggleButton&, void ); void FillAlgor(); - DECL_LINK( FillAlgorHdl, weld::ComboBoxText&, void ); + DECL_LINK( FillAlgorHdl, weld::ComboBox&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPSORT_HXX diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index 01c76e994173..985c389fb2b6 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -20,7 +20,7 @@ namespace sc { DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, weld::Window* pParent) : GenericDialogController(pParent, "modules/scalc/ui/datastreams.ui", "DataStreamDialog") , m_pDocShell(pDocShell) - , m_xCbUrl(new URLBox(m_xBuilder->weld_combo_box_text("url"))) + , m_xCbUrl(new URLBox(m_xBuilder->weld_combo_box("url"))) , m_xBtnBrowse(m_xBuilder->weld_button("browse")) , m_xRBValuesInLine(m_xBuilder->weld_radio_button("valuesinline")) , m_xRBAddressValue(m_xBuilder->weld_radio_button("addressvalue")) @@ -65,7 +65,7 @@ IMPL_LINK_NOARG(DataStreamDlg, UpdateClickHdl, weld::ToggleButton&, void) UpdateEnable(); } -IMPL_LINK_NOARG(DataStreamDlg, UpdateComboBoxHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(DataStreamDlg, UpdateComboBoxHdl, weld::ComboBox&, void) { UpdateEnable(); } diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index d0909c63f34b..62890a86aab8 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -38,7 +38,7 @@ ScLinkedAreaDlg::ScLinkedAreaDlg(weld::Window* pParent) : GenericDialogController(pParent, "modules/scalc/ui/externaldata.ui", "ExternalDataDialog") , m_pSourceShell(nullptr) - , m_xCbUrl(new URLBox(m_xBuilder->weld_combo_box_text("url"))) + , m_xCbUrl(new URLBox(m_xBuilder->weld_combo_box("url"))) , m_xBtnBrowse(m_xBuilder->weld_button("browse")) , m_xLbRanges(m_xBuilder->weld_tree_view("ranges")) , m_xBtnReload(m_xBuilder->weld_check_button("reload")) @@ -70,7 +70,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl, weld::Button&, void) m_xDocInserter->StartExecuteModal( LINK( this, ScLinkedAreaDlg, DialogClosedHdl ) ); } -IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl, weld::ComboBox&, void) { OUString aEntered = m_xCbUrl->GetURL(); if (m_pSourceShell) diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 8515f07121de..9052f5dad7fe 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -37,7 +37,7 @@ ScMoveTableDlg::ScMoveTableDlg(weld::Window* pParent, const OUString& rDefault) , mbEverEdited(false) , m_xBtnMove(m_xBuilder->weld_radio_button("move")) , m_xBtnCopy(m_xBuilder->weld_radio_button("copy")) - , m_xLbDoc(m_xBuilder->weld_combo_box_text("toDocument")) + , m_xLbDoc(m_xBuilder->weld_combo_box("toDocument")) , m_xLbTable(m_xBuilder->weld_tree_view("insertBefore")) , m_xEdTabName(m_xBuilder->weld_entry("newName")) , m_xFtWarn(m_xBuilder->weld_label("newNameWarn")) @@ -273,7 +273,7 @@ IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(ScMoveTableDlg, SelHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(ScMoveTableDlg, SelHdl, weld::ComboBox&, void) { ScDocument* pDoc = GetSelectedDoc(); OUString aName; diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index ba7c93f6161d..cfbc5ee29efa 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -77,9 +77,9 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(weld::Window* pParent, const ScCalcConf , mbSelectedEmptyStringAsZero(rConfig.mbEmptyStringAsZero) , mbWriteConfig(bWriteConfig) , mxEmptyAsZero(m_xBuilder->weld_check_button("checkEmptyAsZero")) - , mxConversion(m_xBuilder->weld_combo_box_text("comboConversion")) + , mxConversion(m_xBuilder->weld_combo_box("comboConversion")) , mxCurrentDocOnly(m_xBuilder->weld_check_button("current_doc")) - , mxSyntax(m_xBuilder->weld_combo_box_text("comboSyntaxRef")) + , mxSyntax(m_xBuilder->weld_combo_box("comboSyntaxRef")) { mxConversion->set_active(static_cast<int>(rConfig.meStringConversion)); mxConversion->connect_changed(LINK(this, ScCalcOptionsDialog, ConversionModifiedHdl)); @@ -128,13 +128,13 @@ IMPL_LINK(ScCalcOptionsDialog, AsZeroModifiedHdl, weld::ToggleButton&, rCheckBox maConfig.mbEmptyStringAsZero = mbSelectedEmptyStringAsZero = rCheckBox.get_active(); } -IMPL_LINK(ScCalcOptionsDialog, ConversionModifiedHdl, weld::ComboBoxText&, rConv, void) +IMPL_LINK(ScCalcOptionsDialog, ConversionModifiedHdl, weld::ComboBox&, rConv, void) { maConfig.meStringConversion = static_cast<ScCalcConfig::StringConversion>(rConv.get_active()); CoupleEmptyAsZeroToStringConversion(); } -IMPL_LINK(ScCalcOptionsDialog, SyntaxModifiedHdl, weld::ComboBoxText&, rSyntax, void) +IMPL_LINK(ScCalcOptionsDialog, SyntaxModifiedHdl, weld::ComboBox&, rSyntax, void) { maConfig.SetStringRefSyntax(toAddressConvention(rSyntax.get_active())); } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 899f04305c9c..8d455797667d 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -26,8 +26,8 @@ public: virtual ~ScCalcOptionsDialog() override; DECL_LINK(AsZeroModifiedHdl, weld::ToggleButton&, void); - DECL_LINK(ConversionModifiedHdl, weld::ComboBoxText&, void); - DECL_LINK(SyntaxModifiedHdl, weld::ComboBoxText&, void); + DECL_LINK(ConversionModifiedHdl, weld::ComboBox&, void); + DECL_LINK(SyntaxModifiedHdl, weld::ComboBox&, void); DECL_LINK(CurrentDocOnlyHdl, weld::ToggleButton&, void); const ScCalcConfig& GetConfig() const { return maConfig;} @@ -42,9 +42,9 @@ private: bool mbWriteConfig; std::unique_ptr<weld::CheckButton> mxEmptyAsZero; - std::unique_ptr<weld::ComboBoxText> mxConversion; + std::unique_ptr<weld::ComboBox> mxConversion; std::unique_ptr<weld::CheckButton> mxCurrentDocOnly; - std::unique_ptr<weld::ComboBoxText> mxSyntax; + std::unique_ptr<weld::ComboBox> mxSyntax; }; #endif diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 4987c1a11bce..683264b1daa4 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -51,7 +51,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(weld::Window* pWindow, SdDrawDocument* pA , m_xRemoveBtn(m_xBuilder->weld_button("rem_btn")) , m_xImagesLst(m_xBuilder->weld_tree_view("images_tree")) , m_xImg(new weld::CustomWeld(*m_xBuilder, "preview_img", m_aImg)) - , m_xInsTypeCombo(m_xBuilder->weld_combo_box_text("opt_combo")) + , m_xInsTypeCombo(m_xBuilder->weld_combo_box("opt_combo")) , m_xASRCheck(m_xBuilder->weld_check_button("asr_check")) , m_xASRCheckCrop(m_xBuilder->weld_check_button("asr_check_crop")) , m_xCapCheck(m_xBuilder->weld_check_button("cap_check")) @@ -644,7 +644,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, weld::TreeView&, void) EnableDisableButtons(); } -IMPL_LINK_NOARG(SdPhotoAlbumDialog, TypeSelectHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SdPhotoAlbumDialog, TypeSelectHdl, weld::ComboBox&, void) { // Enable "Fill Slide" only for one image // If we want to have it for other images too, we need to implement the actual cropping. diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index 2f458555a00f..937edbe8a509 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -58,7 +58,7 @@ private: std::unique_ptr<weld::Button> m_xRemoveBtn; std::unique_ptr<weld::TreeView> m_xImagesLst; std::unique_ptr<weld::CustomWeld> m_xImg; - std::unique_ptr<weld::ComboBoxText> m_xInsTypeCombo; + std::unique_ptr<weld::ComboBox> m_xInsTypeCombo; std::unique_ptr<weld::CheckButton> m_xASRCheck; std::unique_ptr<weld::CheckButton> m_xASRCheckCrop; std::unique_ptr<weld::CheckButton> m_xCapCheck; @@ -73,7 +73,7 @@ private: DECL_LINK(RemoveHdl, weld::Button&, void); DECL_LINK(SelectHdl, weld::TreeView&, void); - DECL_LINK(TypeSelectHdl, weld::ComboBoxText&, void); + DECL_LINK(TypeSelectHdl, weld::ComboBox&, void); Reference< drawing::XDrawPage > appendNewSlide(AutoLayout aLayout, const Reference< drawing::XDrawPages >& xDrawPages); diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index f02d1347f3ad..324429601d33 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -45,8 +45,8 @@ SdModifyFieldDlg::SdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pI , m_pField(pInField) , m_xRbtFix(m_xBuilder->weld_radio_button("fixedRB")) , m_xRbtVar(m_xBuilder->weld_radio_button("varRB")) - , m_xLbLanguage(new LanguageBox(m_xBuilder->weld_combo_box_text("languageLB"))) - , m_xLbFormat(m_xBuilder->weld_combo_box_text("formatLB")) + , m_xLbLanguage(new LanguageBox(m_xBuilder->weld_combo_box("languageLB"))) + , m_xLbFormat(m_xBuilder->weld_combo_box("formatLB")) { m_xLbLanguage->SetLanguageList( SvxLanguageListFlags::ALL|SvxLanguageListFlags::ONLY_KNOWN, false ); m_xLbLanguage->connect_changed(LINK(this, SdModifyFieldDlg, LanguageChangeHdl)); @@ -301,7 +301,7 @@ void SdModifyFieldDlg::FillControls() m_xLbFormat->save_value(); } -IMPL_LINK_NOARG(SdModifyFieldDlg, LanguageChangeHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SdModifyFieldDlg, LanguageChangeHdl, weld::ComboBox&, void) { FillFormatList(); } diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 16f0becb0266..1c6843de8241 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -43,8 +43,8 @@ SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxI , m_xRbtAll(m_xBuilder->weld_radio_button("allslides")) , m_xRbtAtDia(m_xBuilder->weld_radio_button("from")) , m_xRbtCustomshow(m_xBuilder->weld_radio_button("customslideshow")) - , m_xLbDias(m_xBuilder->weld_combo_box_text("from_cb")) - , m_xLbCustomshow(m_xBuilder->weld_combo_box_text("customslideshow_cb")) + , m_xLbDias(m_xBuilder->weld_combo_box("from_cb")) + , m_xLbCustomshow(m_xBuilder->weld_combo_box("customslideshow_cb")) , m_xRbtStandard(m_xBuilder->weld_radio_button("default")) , m_xRbtWindow(m_xBuilder->weld_radio_button("window")) , m_xRbtAuto(m_xBuilder->weld_radio_button("auto")) @@ -57,7 +57,7 @@ SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxI , m_xCbxChangePage(m_xBuilder->weld_check_button("changeslidesbyclick")) , m_xCbxAlwaysOnTop(m_xBuilder->weld_check_button("alwaysontop")) , m_xFtMonitor(m_xBuilder->weld_label("presdisplay_label")) - , m_xLBMonitor(m_xBuilder->weld_combo_box_text("presdisplay_cb")) + , m_xLBMonitor(m_xBuilder->weld_combo_box("presdisplay_cb")) , m_xMonitor(m_xBuilder->weld_label("monitor_str")) , m_xAllMonitors(m_xBuilder->weld_label("allmonitors_str")) , m_xMonitorExternal(m_xBuilder->weld_label("externalmonitor_str")) diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index 2fbe43662959..c8bc7c526945 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -39,12 +39,12 @@ private: std::unique_ptr<weld::RadioButton> m_xRbtFix; std::unique_ptr<weld::RadioButton> m_xRbtVar; std::unique_ptr<LanguageBox> m_xLbLanguage; - std::unique_ptr<weld::ComboBoxText> m_xLbFormat; + std::unique_ptr<weld::ComboBox> m_xLbFormat; void FillFormatList(); void FillControls(); - DECL_LINK(LanguageChangeHdl, weld::ComboBoxText&, void); + DECL_LINK(LanguageChangeHdl, weld::ComboBox&, void); public: SdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet); diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index b147b54606d5..990431646b7c 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -38,8 +38,8 @@ private: std::unique_ptr<weld::RadioButton> m_xRbtAll; std::unique_ptr<weld::RadioButton> m_xRbtAtDia; std::unique_ptr<weld::RadioButton> m_xRbtCustomshow; - std::unique_ptr<weld::ComboBoxText> m_xLbDias; - std::unique_ptr<weld::ComboBoxText> m_xLbCustomshow; + std::unique_ptr<weld::ComboBox> m_xLbDias; + std::unique_ptr<weld::ComboBox> m_xLbCustomshow; std::unique_ptr<weld::RadioButton> m_xRbtStandard; std::unique_ptr<weld::RadioButton> m_xRbtWindow; @@ -55,7 +55,7 @@ private: std::unique_ptr<weld::CheckButton> m_xCbxAlwaysOnTop; std::unique_ptr<weld::Label> m_xFtMonitor; - std::unique_ptr<weld::ComboBoxText> m_xLBMonitor; + std::unique_ptr<weld::ComboBox> m_xLBMonitor; std::unique_ptr<weld::Label> m_xMonitor; std::unique_ptr<weld::Label> m_xAllMonitors; diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 980f7dda4abc..4cef840d4ef6 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -57,13 +57,13 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(TabPageParent pParent, const Sf , m_xName(m_xBuilder->weld_entry("name")) , m_xAutoCB(m_xBuilder->weld_check_button("autoupdate")) , m_xFollowFt(m_xBuilder->weld_label("nextstyleft")) - , m_xFollowLb(m_xBuilder->weld_combo_box_text("nextstyle")) + , m_xFollowLb(m_xBuilder->weld_combo_box("nextstyle")) , m_xEditStyleBtn(m_xBuilder->weld_button("editstyle")) , m_xBaseFt(m_xBuilder->weld_label("linkedwithft")) - , m_xBaseLb(m_xBuilder->weld_combo_box_text("linkedwith")) + , m_xBaseLb(m_xBuilder->weld_combo_box("linkedwith")) , m_xEditLinkStyleBtn(m_xBuilder->weld_button("editlinkstyle")) , m_xFilterFt(m_xBuilder->weld_label("categoryft")) - , m_xFilterLb(m_xBuilder->weld_combo_box_text("category")) + , m_xFilterLb(m_xBuilder->weld_combo_box("category")) , m_xDescFt(m_xBuilder->weld_label("desc")) , m_xNameFt(m_xBuilder->weld_label("nameft")) { @@ -250,7 +250,7 @@ void SfxManageStyleSheetPage::dispose() SfxTabPage::dispose(); } -void SfxManageStyleSheetPage::UpdateName_Impl( weld::ComboBoxText* pBox, +void SfxManageStyleSheetPage::UpdateName_Impl( weld::ComboBox* pBox, const OUString& rNew ) /* [Description] @@ -312,7 +312,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() m_xDescFt->set_label(pStyle->GetDescription(eUnit)); } -IMPL_LINK_NOARG(SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, weld::ComboBox&, void) { OUString aTemplName(m_xFollowLb->get_active_text()); OUString aEditTemplName(m_xName->get_text()); @@ -328,7 +328,7 @@ IMPL_LINK_NOARG(SfxManageStyleSheetPage, EditStyleHdl_Impl, weld::Button&, void) Execute_Impl(SID_STYLE_EDIT, aTemplName, static_cast<sal_uInt16>(pStyle->GetFamily())); } -IMPL_LINK_NOARG(SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, weld::ComboBox&, void) { int linkSelectPos = m_xBaseLb->get_active(); if ( linkSelectPos == 0 ) diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 24d0f570ad3c..003a58f0eb92 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -54,7 +54,7 @@ IMPL_LINK_NOARG(SfxNewStyleDlg, OKHdl, weld::TreeView&, void) OKClickHdl(*m_xOKBtn); } -IMPL_LINK(SfxNewStyleDlg, ModifyHdl, weld::ComboBoxText&, rBox, void) +IMPL_LINK(SfxNewStyleDlg, ModifyHdl, weld::ComboBox&, rBox, void) { m_xOKBtn->set_sensitive(!rBox.get_active_text().replaceAll(" ", "").isEmpty()); } diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 847f65783ed4..68b56efdb4d9 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -342,7 +342,7 @@ class SmSymbolDialog : public weld::GenericDialogController SmShowSymbol m_aSymbolDisplay; - std::unique_ptr<weld::ComboBoxText> m_xSymbolSets; + std::unique_ptr<weld::ComboBox> m_xSymbolSets; std::unique_ptr<SmShowSymbolSet> m_xSymbolSetDisplay; std::unique_ptr<weld::CustomWeld> m_xSymbolSetDisplayArea; std::unique_ptr<weld::Label> m_xSymbolName; @@ -350,7 +350,7 @@ class SmSymbolDialog : public weld::GenericDialogController std::unique_ptr<weld::Button> m_xGetBtn; std::unique_ptr<weld::Button> m_xEditBtn; - DECL_LINK(SymbolSetChangeHdl, weld::ComboBoxText&, void); + DECL_LINK(SymbolSetChangeHdl, weld::ComboBox&, void); DECL_LINK(SymbolChangeHdl, SmShowSymbolSet&, void); DECL_LINK(SymbolDblClickHdl, SmShowSymbol&, void); DECL_LINK(SymbolDblClickHdl2, SmShowSymbolSet&, void); @@ -409,13 +409,13 @@ class SmSymDefineDialog : public weld::GenericDialogController std::unique_ptr<SmSym> m_xOrigSymbol; std::unique_ptr<SubsetMap> m_xSubsetMap; std::unique_ptr<FontList> m_xFontList; - std::unique_ptr<weld::ComboBoxText> m_xOldSymbols; - std::unique_ptr<weld::ComboBoxText> m_xOldSymbolSets; - std::unique_ptr<weld::ComboBoxText> m_xSymbols; - std::unique_ptr<weld::ComboBoxText> m_xSymbolSets; - std::unique_ptr<weld::ComboBoxText> m_xFonts; - std::unique_ptr<weld::ComboBoxText> m_xFontsSubsetLB; - std::unique_ptr<weld::ComboBoxText> m_xStyles; + std::unique_ptr<weld::ComboBox> m_xOldSymbols; + std::unique_ptr<weld::ComboBox> m_xOldSymbolSets; + std::unique_ptr<weld::ComboBox> m_xSymbols; + std::unique_ptr<weld::ComboBox> m_xSymbolSets; + std::unique_ptr<weld::ComboBox> m_xFonts; + std::unique_ptr<weld::ComboBox> m_xFontsSubsetLB; + std::unique_ptr<weld::ComboBox> m_xStyles; std::unique_ptr<weld::Label> m_xOldSymbolName; std::unique_ptr<weld::Label> m_xOldSymbolSetName; std::unique_ptr<weld::Label> m_xSymbolName; @@ -428,19 +428,19 @@ class SmSymDefineDialog : public weld::GenericDialogController std::unique_ptr<SvxShowCharSet> m_xCharsetDisplay; std::unique_ptr<weld::CustomWeld> m_xCharsetDisplayArea; - DECL_LINK(OldSymbolChangeHdl, weld::ComboBoxText&, void); - DECL_LINK(OldSymbolSetChangeHdl, weld::ComboBoxText&, void); - DECL_LINK(ModifyHdl, weld::ComboBoxText&, void); - DECL_LINK(FontChangeHdl, weld::ComboBoxText&, void); - DECL_LINK(SubsetChangeHdl, weld::ComboBoxText&, void); - DECL_LINK(StyleChangeHdl, weld::ComboBoxText&, void); + DECL_LINK(OldSymbolChangeHdl, weld::ComboBox&, void); + DECL_LINK(OldSymbolSetChangeHdl, weld::ComboBox&, void); + DECL_LINK(ModifyHdl, weld::ComboBox&, void); + DECL_LINK(FontChangeHdl, weld::ComboBox&, void); + DECL_LINK(SubsetChangeHdl, weld::ComboBox&, void); + DECL_LINK(StyleChangeHdl, weld::ComboBox&, void); DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void); DECL_LINK(AddClickHdl, weld::Button&, void); DECL_LINK(ChangeClickHdl, weld::Button&, void); DECL_LINK(DeleteClickHdl, weld::Button&, void); - void FillSymbols(weld::ComboBoxText& rComboBox, bool bDeleteText = true); - void FillSymbolSets(weld::ComboBoxText& rComboBox, bool bDeleteText = true); + void FillSymbols(weld::ComboBox& rComboBox, bool bDeleteText = true); + void FillSymbolSets(weld::ComboBox& rComboBox, bool bDeleteText = true); void FillFonts(); void FillStyles(); @@ -449,15 +449,15 @@ class SmSymDefineDialog : public weld::GenericDialogController void SetOrigSymbol(const SmSym *pSymbol, const OUString &rSymbolSetName); void UpdateButtons(); - bool SelectSymbolSet(weld::ComboBoxText &rComboBox, const OUString &rSymbolSetName, + bool SelectSymbolSet(weld::ComboBox &rComboBox, const OUString &rSymbolSetName, bool bDeleteText); - bool SelectSymbol(weld::ComboBoxText& rComboBox, const OUString &rSymbolName, + bool SelectSymbol(weld::ComboBox& rComboBox, const OUString &rSymbolName, bool bDeleteText); bool SelectFont(const OUString &rFontName, bool bApplyFont); bool SelectStyle(const OUString &rStyleName, bool bApplyFont); - SmSym* GetSymbol(const weld::ComboBoxText& rComboBox); - const SmSym* GetSymbol(const weld::ComboBoxText& rComboBox) const + SmSym* GetSymbol(const weld::ComboBox& rComboBox); + const SmSym* GetSymbol(const weld::ComboBox& rComboBox) const { return const_cast<SmSymDefineDialog *>(this)->GetSymbol(rComboBox); } diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 9f9e0b0cefb4..e6346d4dc6e4 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -137,12 +137,12 @@ public: class SmFontPickListBox final : public SmFontPickList { private: - std::unique_ptr<weld::ComboBoxText> m_xWidget; + std::unique_ptr<weld::ComboBox> m_xWidget; - DECL_LINK(SelectHdl, weld::ComboBoxText&, void); + DECL_LINK(SelectHdl, weld::ComboBox&, void); public: - SmFontPickListBox(std::unique_ptr<weld::ComboBoxText> pWidget); + SmFontPickListBox(std::unique_ptr<weld::ComboBox> pWidget); SmFontPickListBox& operator = (const SmFontPickList& rList); virtual void Insert(const vcl::Font &rFont) override; }; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 279f99a5e734..7c46a234edb6 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -499,13 +499,13 @@ IMPL_LINK_NOARG(SmFontTypeDialog, DefaultButtonClickHdl, weld::Button&, void) SmFontTypeDialog::SmFontTypeDialog(weld::Window* pParent, OutputDevice *pFntListDevice) : GenericDialogController(pParent, "modules/smath/ui/fonttypedialog.ui", "FontsDialog") , pFontListDev(pFntListDevice) - , m_xVariableFont(new SmFontPickListBox(m_xBuilder->weld_combo_box_text("variableCB"))) - , m_xFunctionFont(new SmFontPickListBox(m_xBuilder->weld_combo_box_text("functionCB"))) - , m_xNumberFont(new SmFontPickListBox(m_xBuilder->weld_combo_box_text("numberCB"))) - , m_xTextFont(new SmFontPickListBox(m_xBuilder->weld_combo_box_text("textCB"))) - , m_xSerifFont(new SmFontPickListBox(m_xBuilder->weld_combo_box_text("serifCB"))) - , m_xSansFont(new SmFontPickListBox(m_xBuilder->weld_combo_box_text("sansCB"))) - , m_xFixedFont(new SmFontPickListBox(m_xBuilder->weld_combo_box_text("fixedCB"))) + , m_xVariableFont(new SmFontPickListBox(m_xBuilder->weld_combo_box("variableCB"))) + , m_xFunctionFont(new SmFontPickListBox(m_xBuilder->weld_combo_box("functionCB"))) + , m_xNumberFont(new SmFontPickListBox(m_xBuilder->weld_combo_box("numberCB"))) + , m_xTextFont(new SmFontPickListBox(m_xBuilder->weld_combo_box("textCB"))) + , m_xSerifFont(new SmFontPickListBox(m_xBuilder->weld_combo_box("serifCB"))) + , m_xSansFont(new SmFontPickListBox(m_xBuilder->weld_combo_box("sansCB"))) + , m_xFixedFont(new SmFontPickListBox(m_xBuilder->weld_combo_box("fixedCB"))) , m_xMenuButton(m_xBuilder->weld_menu_button("modify")) , m_xDefaultButton(m_xBuilder->weld_button("default")) { @@ -1231,7 +1231,7 @@ void SmSymbolDialog::FillSymbolSets() m_xSymbolSets->append_text(*aIt); } -IMPL_LINK_NOARG( SmSymbolDialog, SymbolSetChangeHdl, weld::ComboBoxText&, void ) +IMPL_LINK_NOARG( SmSymbolDialog, SymbolSetChangeHdl, weld::ComboBox&, void ) { SelectSymbolSet(m_xSymbolSets->get_active_text()); } @@ -1316,7 +1316,7 @@ SmSymbolDialog::SmSymbolDialog(weld::Window *pParent, OutputDevice *pFntListDevi , rViewSh(rViewShell) , rSymbolMgr(rMgr) , pFontListDev(pFntListDevice) - , m_xSymbolSets(m_xBuilder->weld_combo_box_text("symbolset")) + , m_xSymbolSets(m_xBuilder->weld_combo_box("symbolset")) , m_xSymbolSetDisplay(new SmShowSymbolSet(m_xBuilder->weld_scrolled_window("scrolledwindow"))) , m_xSymbolSetDisplayArea(new weld::CustomWeld(*m_xBuilder, "symbolsetdisplay", *m_xSymbolSetDisplay)) , m_xSymbolName(m_xBuilder->weld_label("symbolname")) @@ -1457,7 +1457,7 @@ void SmShowChar::SetSymbol( sal_UCS4 cChar, const vcl::Font &rFont ) Invalidate(); } -void SmSymDefineDialog::FillSymbols(weld::ComboBoxText& rComboBox, bool bDeleteText) +void SmSymDefineDialog::FillSymbols(weld::ComboBox& rComboBox, bool bDeleteText) { assert((&rComboBox == m_xOldSymbols.get() || &rComboBox == m_xSymbols.get()) && "Sm : wrong ComboBox"); @@ -1465,13 +1465,13 @@ void SmSymDefineDialog::FillSymbols(weld::ComboBoxText& rComboBox, bool bDeleteT if (bDeleteText) rComboBox.set_entry_text(OUString()); - weld::ComboBoxText& rBox = &rComboBox == m_xOldSymbols.get() ? *m_xOldSymbolSets : *m_xSymbolSets; + weld::ComboBox& rBox = &rComboBox == m_xOldSymbols.get() ? *m_xOldSymbolSets : *m_xSymbolSets; SymbolPtrVec_t aSymSet(m_aSymbolMgrCopy.GetSymbolSet(rBox.get_active_text())); for (const SmSym* i : aSymSet) rComboBox.append_text(i->GetName()); } -void SmSymDefineDialog::FillSymbolSets(weld::ComboBoxText& rComboBox, bool bDeleteText) +void SmSymDefineDialog::FillSymbolSets(weld::ComboBox& rComboBox, bool bDeleteText) { assert((&rComboBox == m_xOldSymbolSets.get() || &rComboBox == m_xSymbolSets.get()) && "Sm : wrong ComboBox"); @@ -1519,27 +1519,27 @@ void SmSymDefineDialog::FillStyles() } } -SmSym* SmSymDefineDialog::GetSymbol(const weld::ComboBoxText& rComboBox) +SmSym* SmSymDefineDialog::GetSymbol(const weld::ComboBox& rComboBox) { assert((&rComboBox == m_xOldSymbols.get() || &rComboBox == m_xSymbols.get()) && "Sm : wrong combobox"); return m_aSymbolMgrCopy.GetSymbolByName(rComboBox.get_active_text()); } -IMPL_LINK(SmSymDefineDialog, OldSymbolChangeHdl, weld::ComboBoxText&, rComboBox, void) +IMPL_LINK(SmSymDefineDialog, OldSymbolChangeHdl, weld::ComboBox&, rComboBox, void) { (void) rComboBox; assert(&rComboBox == m_xOldSymbols.get() && "Sm : wrong argument"); SelectSymbol(*m_xOldSymbols, m_xOldSymbols->get_active_text(), false); } -IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, weld::ComboBoxText&, rComboBox, void ) +IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, weld::ComboBox&, rComboBox, void ) { (void) rComboBox; assert(&rComboBox == m_xOldSymbolSets.get() && "Sm : wrong argument"); SelectSymbolSet(*m_xOldSymbolSets, m_xOldSymbolSets->get_active_text(), false); } -IMPL_LINK(SmSymDefineDialog, ModifyHdl, weld::ComboBoxText&, rComboBox, void) +IMPL_LINK(SmSymDefineDialog, ModifyHdl, weld::ComboBox&, rComboBox, void) { // remember cursor position for later restoring of it int nStartPos, nEndPos; @@ -1566,7 +1566,7 @@ IMPL_LINK(SmSymDefineDialog, ModifyHdl, weld::ComboBoxText&, rComboBox, void) UpdateButtons(); } -IMPL_LINK(SmSymDefineDialog, FontChangeHdl, weld::ComboBoxText&, rListBox, void) +IMPL_LINK(SmSymDefineDialog, FontChangeHdl, weld::ComboBox&, rListBox, void) { (void) rListBox; assert(&rListBox == m_xFonts.get() && "Sm : wrong argument"); @@ -1574,7 +1574,7 @@ IMPL_LINK(SmSymDefineDialog, FontChangeHdl, weld::ComboBoxText&, rListBox, void) SelectFont(m_xFonts->get_active_text()); } -IMPL_LINK_NOARG(SmSymDefineDialog, SubsetChangeHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SmSymDefineDialog, SubsetChangeHdl, weld::ComboBox&, void) { int nPos = m_xFontsSubsetLB->get_active(); if (nPos != -1) @@ -1587,7 +1587,7 @@ IMPL_LINK_NOARG(SmSymDefineDialog, SubsetChangeHdl, weld::ComboBoxText&, void) } } -IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, weld::ComboBoxText&, rComboBox, void ) +IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, weld::ComboBox&, rComboBox, void ) { (void) rComboBox; assert(&rComboBox == m_xStyles.get() && "Sm : wrong argument"); @@ -1747,13 +1747,13 @@ SmSymDefineDialog::SmSymDefineDialog(weld::Window* pParent, OutputDevice *pFntLi , m_xVirDev(VclPtr<VirtualDevice>::Create()) , m_rSymbolMgr(rMgr) , m_xFontList(new FontList(pFntListDevice)) - , m_xOldSymbols(m_xBuilder->weld_combo_box_text("oldSymbols")) - , m_xOldSymbolSets(m_xBuilder->weld_combo_box_text("oldSymbolSets")) - , m_xSymbols(m_xBuilder->weld_combo_box_text("symbols")) - , m_xSymbolSets(m_xBuilder->weld_combo_box_text("symbolSets")) - , m_xFonts(m_xBuilder->weld_combo_box_text("fonts")) - , m_xFontsSubsetLB(m_xBuilder->weld_combo_box_text("fontsSubsetLB")) - , m_xStyles(m_xBuilder->weld_combo_box_text("styles")) + , m_xOldSymbols(m_xBuilder->weld_combo_box("oldSymbols")) + , m_xOldSymbolSets(m_xBuilder->weld_combo_box("oldSymbolSets")) + , m_xSymbols(m_xBuilder->weld_combo_box("symbols")) + , m_xSymbolSets(m_xBuilder->weld_combo_box("symbolSets")) + , m_xFonts(m_xBuilder->weld_combo_box("fonts")) + , m_xFontsSubsetLB(m_xBuilder->weld_combo_box("fontsSubsetLB")) + , m_xStyles(m_xBuilder->weld_combo_box("styles")) , m_xOldSymbolName(m_xBuilder->weld_label("oldSymbolName")) , m_xOldSymbolSetName(m_xBuilder->weld_label("oldSymbolSetName")) , m_xSymbolName(m_xBuilder->weld_label("symbolName")) @@ -1832,7 +1832,7 @@ void SmSymDefineDialog::SetSymbolSetManager(const SmSymbolManager &rMgr) UpdateButtons(); } -bool SmSymDefineDialog::SelectSymbolSet(weld::ComboBoxText& rComboBox, +bool SmSymDefineDialog::SelectSymbolSet(weld::ComboBox& rComboBox, const OUString &rSymbolSetName, bool bDeleteText) { assert((&rComboBox == m_xOldSymbolSets.get() || &rComboBox == m_xSymbolSets.get()) && "Sm : wrong ComboBox"); @@ -1862,7 +1862,7 @@ bool SmSymDefineDialog::SelectSymbolSet(weld::ComboBoxText& rComboBox, rFT.set_label(rComboBox.get_active_text()); // set the symbol name which belongs to the SymbolSet at the associated combobox - weld::ComboBoxText& rCB = bIsOld ? *m_xOldSymbols : *m_xSymbols; + weld::ComboBox& rCB = bIsOld ? *m_xOldSymbols : *m_xSymbols; FillSymbols(rCB, false); // display a valid respectively no symbol when changing the SymbolSets @@ -1906,7 +1906,7 @@ void SmSymDefineDialog::SetOrigSymbol(const SmSym *pSymbol, } -bool SmSymDefineDialog::SelectSymbol(weld::ComboBoxText& rComboBox, +bool SmSymDefineDialog::SelectSymbol(weld::ComboBox& rComboBox, const OUString &rSymbolName, bool bDeleteText) { assert((&rComboBox == m_xOldSymbols.get() || &rComboBox == m_xSymbols.get()) && "Sm : wrong ComboBox"); diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index 4214e609e3da..1018bad60c04 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -120,14 +120,14 @@ void SmFontPickList::WriteTo(SmFontDialog& rDialog) const /**************************************************************************/ -SmFontPickListBox::SmFontPickListBox(std::unique_ptr<weld::ComboBoxText> pWidget) +SmFontPickListBox::SmFontPickListBox(std::unique_ptr<weld::ComboBox> pWidget) : SmFontPickList(4) , m_xWidget(std::move(pWidget)) { m_xWidget->connect_changed(LINK(this, SmFontPickListBox, SelectHdl)); } -IMPL_LINK_NOARG(SmFontPickListBox, SelectHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SmFontPickListBox, SelectHdl, weld::ComboBox&, void) { OUString aString; diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 75ac23aed95f..6f1494d9c9d8 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1222,7 +1222,7 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList ) } } -SvtFontStyleBox::SvtFontStyleBox(std::unique_ptr<weld::ComboBoxText> p) +SvtFontStyleBox::SvtFontStyleBox(std::unique_ptr<weld::ComboBox> p) : m_xComboBox(std::move(p)) { //Use the standard texts to get an optimal size and stick to that size. @@ -1698,7 +1698,7 @@ sal_Int64 FontSizeBox::GetValueFromStringUnit(const OUString& rStr, FieldUnit eO return MetricBox::GetValueFromStringUnit( rStr, eOutUnit ); } -SvtFontSizeBox::SvtFontSizeBox(std::unique_ptr<weld::ComboBoxText> p) +SvtFontSizeBox::SvtFontSizeBox(std::unique_ptr<weld::ComboBox> p) : pFontList(nullptr) , nSavedValue(0) , nMin(20) @@ -1735,7 +1735,7 @@ IMPL_LINK_NOARG(SvtFontSizeBox, ReformatHdl, weld::Widget&, void) set_value(get_value()); } -IMPL_LINK(SvtFontSizeBox, ModifyHdl, weld::ComboBoxText&, rBox, void) +IMPL_LINK(SvtFontSizeBox, ModifyHdl, weld::ComboBox&, rBox, void) { if (bRelativeMode) { diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 25e70761e7d4..cb6586600939 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -2009,7 +2009,7 @@ IMPL_LINK_NOARG(URLBox, TryAutoComplete, Timer *, void) m_xWidget->clear(); } -URLBox::URLBox(std::unique_ptr<weld::ComboBoxText> pWidget) +URLBox::URLBox(std::unique_ptr<weld::ComboBox> pWidget) : bHistoryDisabled(false) , m_xWidget(std::move(pWidget)) { @@ -2097,7 +2097,7 @@ void URLBox::UpdatePicklistForSmartProtocol_Impl() } } -IMPL_LINK_NOARG(URLBox, ChangedHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(URLBox, ChangedHdl, weld::ComboBox&, void) { aChangedIdle.Start(); //launch this to happen on idle after cursor position will have been set } diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 06cf1a118062..1dd17fa27bdd 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -24,7 +24,7 @@ PlaceEditDialog::PlaceEditDialog(weld::Window* pParent) , m_bLabelChanged( false ) , m_bShowPassword( true ) , m_xEDServerName(m_xBuilder->weld_entry("name")) - , m_xLBServerType(m_xBuilder->weld_combo_box_text("type")) + , m_xLBServerType(m_xBuilder->weld_combo_box("type")) , m_xEDUsername(m_xBuilder->weld_entry("login")) , m_xFTUsernameLabel(m_xBuilder->weld_label("loginLabel")) , m_xBTOk(m_xBuilder->weld_button("ok")) @@ -38,7 +38,7 @@ PlaceEditDialog::PlaceEditDialog(weld::Window* pParent) , m_xRepositoryBox(m_xBuilder->weld_widget("RepositoryDetails")) , m_xFTRepository(m_xBuilder->weld_label("repositoryLabel")) - , m_xLBRepository(m_xBuilder->weld_combo_box_text("repositories")) + , m_xLBRepository(m_xBuilder->weld_combo_box("repositories")) , m_xEDShare(m_xBuilder->weld_entry("share")) , m_xFTShare(m_xBuilder->weld_label("shareLabel")) @@ -76,7 +76,7 @@ PlaceEditDialog::PlaceEditDialog(weld::Window* pParent, const std::shared_ptr<Pl , m_bLabelChanged( true ) , m_bShowPassword( false ) , m_xEDServerName(m_xBuilder->weld_entry("name")) - , m_xLBServerType(m_xBuilder->weld_combo_box_text("type")) + , m_xLBServerType(m_xBuilder->weld_combo_box("type")) , m_xEDUsername(m_xBuilder->weld_entry("login")) , m_xFTUsernameLabel(m_xBuilder->weld_label("loginLabel")) , m_xBTOk(m_xBuilder->weld_button("ok")) @@ -310,7 +310,7 @@ IMPL_LINK_NOARG( PlaceEditDialog, EditUsernameHdl, weld::Entry&, void ) EditHdl(nullptr); } -IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl, weld::ComboBoxText&, void ) +IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl, weld::ComboBox&, void ) { SelectType(false); } diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 7fbc80c3eb0c..fce35b75717b 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -482,7 +482,7 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl, weld::Button&, void ) {} } -IMPL_LINK_NOARG( CmisDetailsContainer, SelectRepoHdl, weld::ComboBoxText&, void ) +IMPL_LINK_NOARG( CmisDetailsContainer, SelectRepoHdl, weld::ComboBox&, void ) { selectRepository( ); } diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index c6f4e5a4a3cd..5d415c32645d 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -25,7 +25,7 @@ #include <sal/log.hxx> void ImplFillPrnDlgListBox( const Printer* pPrinter, - weld::ComboBoxText* pBox, weld::Button* pPropBtn ) + weld::ComboBox* pBox, weld::Button* pPropBtn ) { ImplFreePrnDlgListBox( pBox ); @@ -43,14 +43,14 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter, } -void ImplFreePrnDlgListBox( weld::ComboBoxText* pBox, bool bClear ) +void ImplFreePrnDlgListBox( weld::ComboBox* pBox, bool bClear ) { if ( bClear ) pBox->clear(); } -Printer* ImplPrnDlgListBoxSelect( const weld::ComboBoxText* pBox, weld::Button* pPropBtn, +Printer* ImplPrnDlgListBoxSelect( const weld::ComboBox* pBox, weld::Button* pPropBtn, Printer const * pPrinter, Printer* pTempPrinterIn ) { VclPtr<Printer> pTempPrinter( pTempPrinterIn ); @@ -108,7 +108,7 @@ Printer* ImplPrnDlgUpdatePrinter( Printer const * pPrinter, Printer* pTempPrinte } -void ImplPrnDlgUpdateQueueInfo( const weld::ComboBoxText* pBox, QueueInfo& rInfo ) +void ImplPrnDlgUpdateQueueInfo( const weld::ComboBox* pBox, QueueInfo& rInfo ) { if ( pBox->get_active() != -1 ) { @@ -210,7 +210,7 @@ OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) PrinterSetupDialog::PrinterSetupDialog(weld::Window* pParent) : GenericDialogController(pParent, "svt/ui/printersetupdialog.ui", "PrinterSetupDialog") - , m_xLbName(m_xBuilder->weld_combo_box_text("name")) + , m_xLbName(m_xBuilder->weld_combo_box("name")) , m_xBtnProperties(m_xBuilder->weld_button("properties")) , m_xBtnOptions(m_xBuilder->weld_button("options")) , m_xFiStatus(m_xBuilder->weld_label("status")) @@ -281,7 +281,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl, weld::Button&, void) mpTempPrinter->Setup(m_xDialog.get()); } -IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl, weld::ComboBox&, void) { mpTempPrinter = ImplPrnDlgListBoxSelect(m_xLbName.get(), m_xBtnProperties.get(), mpPrinter, mpTempPrinter); diff --git a/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx b/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx index 8d5ef1950153..cc1d1427efc0 100644 --- a/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx +++ b/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx @@ -89,7 +89,7 @@ void SvxNumOptionsTabPageHelper::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 n } } -void SvxNumOptionsTabPageHelper::GetI18nNumbering(weld::ComboBoxText& rFmtLB, sal_uInt16 nDoNotRemove) +void SvxNumOptionsTabPageHelper::GetI18nNumbering(weld::ComboBox& rFmtLB, sal_uInt16 nDoNotRemove) { Reference<XDefaultNumberingProvider> xDefNum = GetNumberingProvider(); Reference<XNumberingTypeInfo> xInfo(xDefNum, UNO_QUERY); diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 1fe8e3e9bab1..3c68d0f1d5b1 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -85,9 +85,9 @@ void CompressGraphicsDialog::Initialize() m_xReduceResolutionCB = m_xBuilder->weld_check_button("checkbox-reduce-resolution"); m_xMFNewWidth = m_xBuilder->weld_spin_button("spin-new-width"); m_xMFNewHeight = m_xBuilder->weld_spin_button("spin-new-height"); - m_xResolutionLB = m_xBuilder->weld_combo_box_text("combo-resolution"); + m_xResolutionLB = m_xBuilder->weld_combo_box("combo-resolution"); m_xBtnCalculate = m_xBuilder->weld_button("calculate"); - m_xInterpolationCombo = m_xBuilder->weld_combo_box_text("interpolation-method-combo"); + m_xInterpolationCombo = m_xBuilder->weld_combo_box("interpolation-method-combo"); m_xInterpolationCombo->set_active_text("Lanczos"); @@ -289,7 +289,7 @@ IMPL_LINK( CompressGraphicsDialog, SlideHdl, weld::Scale&, rScale, void ) Update(); } -IMPL_LINK_NOARG( CompressGraphicsDialog, NewInterpolationModifiedHdl, weld::ComboBoxText&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, NewInterpolationModifiedHdl, weld::ComboBox&, void ) { Update(); } @@ -315,7 +315,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, NewHeightModifiedHdl, weld::Entry&, voi Update(); } -IMPL_LINK_NOARG( CompressGraphicsDialog, ResolutionModifiedHdl, weld::ComboBoxText&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, ResolutionModifiedHdl, weld::ComboBox&, void ) { m_dResolution = static_cast<double>(m_xResolutionLB->get_active_text().toInt32()); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 4c737d080569..9770f45587ff 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -753,7 +753,7 @@ void LanguageBox::InsertLanguage(const LanguageType nLangType) m_xControl->append(OUString::number(static_cast<sal_uInt16>(nLangType)), aStrEntry); } -IMPL_LINK(LanguageBox, ChangeHdl, weld::ComboBoxText&, rControl, void) +IMPL_LINK(LanguageBox, ChangeHdl, weld::ComboBox&, rControl, void) { if (rControl.has_entry()) { @@ -826,7 +826,7 @@ IMPL_LINK(LanguageBox, ChangeHdl, weld::ComboBoxText&, rControl, void) m_aChangeHdl.Call(rControl); } -LanguageBox::LanguageBox(std::unique_ptr<weld::ComboBoxText> pControl) +LanguageBox::LanguageBox(std::unique_ptr<weld::ComboBox> pControl) : m_xControl(std::move(pControl)) , m_aAllString(SvxResId(RID_SVXSTR_LANGUAGE_ALL)) , m_eSavedLanguage(LANGUAGE_DONTKNOW) diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx index 1c8b71fee63e..b67a088fd750 100644 --- a/svx/source/dialog/pagenumberlistbox.cxx +++ b/svx/source/dialog/pagenumberlistbox.cxx @@ -74,7 +74,7 @@ Size PageNumberListBox::GetOptimalSize() const return Size(150, ListBox::GetOptimalSize().Height()); } -SvxPageNumberListBox::SvxPageNumberListBox(std::unique_ptr<weld::ComboBoxText> pControl) +SvxPageNumberListBox::SvxPageNumberListBox(std::unique_ptr<weld::ComboBox> pControl) : m_xControl(std::move(pControl)) { m_xControl->set_size_request(150, -1); diff --git a/svx/source/dialog/papersizelistbox.cxx b/svx/source/dialog/papersizelistbox.cxx index 5e52dc2a07d0..9a5440889af1 100644 --- a/svx/source/dialog/papersizelistbox.cxx +++ b/svx/source/dialog/papersizelistbox.cxx @@ -84,7 +84,7 @@ Size PaperSizeListBox::GetOptimalSize() const return Size(150, ListBox::GetOptimalSize().Height()); } -SvxPaperSizeListBox::SvxPaperSizeListBox(std::unique_ptr<weld::ComboBoxText> pControl) +SvxPaperSizeListBox::SvxPaperSizeListBox(std::unique_ptr<weld::ComboBox> pControl) : m_xControl(std::move(pControl)) { m_xControl->set_size_request(150, -1); diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 6e8a7d974119..16b2c1d33c1d 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -224,7 +224,7 @@ void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc ) SelectEntryPos( nAt ); } -TextEncodingBox::TextEncodingBox(std::unique_ptr<weld::ComboBoxText> pControl) +TextEncodingBox::TextEncodingBox(std::unique_ptr<weld::ComboBox> pControl) : m_xControl(std::move(pControl)) { m_xControl->make_sorted(); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 5d76624da921..b47f62ce7a54 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -3338,7 +3338,7 @@ namespace svxform : GenericDialogController(pParent, "svx/ui/addinstancedialog.ui", "AddInstanceDialog") , m_xNameED(m_xBuilder->weld_entry("name")) , m_xURLFT(m_xBuilder->weld_label("urlft")) - , m_xURLED(new URLBox(m_xBuilder->weld_combo_box_text("url"))) + , m_xURLED(new URLBox(m_xBuilder->weld_combo_box("url"))) , m_xFilePickerBtn(m_xBuilder->weld_button("browse")) , m_xLinkInstanceCB(m_xBuilder->weld_check_button("link")) , m_xAltTitle(m_xBuilder->weld_label("alttitle")) diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 9ae7ed92c2a5..293b30342a36 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -187,7 +187,7 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL, aName = rName; } -void GalleryTheme::InsertAllThemes(weld::ComboBoxText& rListBox) +void GalleryTheme::InsertAllThemes(weld::ComboBox& rListBox) { for (size_t i = 0; i < SAL_N_ELEMENTS(aUnlocalized); ++i) rListBox.append_text(OUString::createFromAscii(aUnlocalized[i].second)); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 50f81f4a02b6..e1e1a73cb2c3 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1385,7 +1385,7 @@ ColorWindow::ColorWindow(std::shared_ptr<PaletteManager> const & rPaletteManager , mxColorSet(new ColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin"))) , mxRecentColorSet(new ColorValueSet(nullptr)) , mxTopLevel(m_xBuilder->weld_container("palette_popup_window")) - , mxPaletteListBox(m_xBuilder->weld_combo_box_text("palette_listbox")) + , mxPaletteListBox(m_xBuilder->weld_combo_box("palette_listbox")) , mxButtonAutoColor(m_xBuilder->weld_button("auto_color_button")) , mxButtonNoneColor(m_xBuilder->weld_button("none_color_button")) , mxButtonPicker(m_xBuilder->weld_button("color_picker_button")) @@ -1644,7 +1644,7 @@ IMPL_LINK_NOARG(SvxColorWindow, SelectPaletteHdl, ListBox&, void) mpColorSet->layoutToGivenHeight(mpColorSet->GetSizePixel().Height(), mxPaletteManager->GetColorCount()); } -IMPL_LINK_NOARG(ColorWindow, SelectPaletteHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(ColorWindow, SelectPaletteHdl, weld::ComboBox&, void) { int nPos = mxPaletteListBox->get_active(); mxPaletteManager->SetPalette( nPos ); diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 09bd02196528..c38cf044291c 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -70,7 +70,7 @@ struct SwDBFormatData }; namespace weld { - class ComboBoxText; + class ComboBox; class Window; } @@ -312,17 +312,17 @@ public: void SetInitDBFields(bool b) { bInitDBFields = b; } /// Fill listbox with all table names of a database. - bool GetTableNames(weld::ComboBoxText& rBox, const OUString& rDBName); + bool GetTableNames(weld::ComboBox& rBox, const OUString& rDBName); /// Fill listbox with all column names of a database table. void GetColumnNames(ListBox* pListBox, const OUString& rDBName, const OUString& rTableName); - void GetColumnNames(weld::ComboBoxText& rBox, + void GetColumnNames(weld::ComboBox& rBox, const OUString& rDBName, const OUString& rTableName); static void GetColumnNames(ListBox* pListBox, css::uno::Reference< css::sdbc::XConnection> const & xConnection, const OUString& rTableName); - static void GetColumnNames(weld::ComboBoxText& rBox, + static void GetColumnNames(weld::ComboBox& rBox, css::uno::Reference< css::sdbc::XConnection> const & xConnection, const OUString& rTableName); diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index f350262e44ad..9afdb75a9118 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -68,7 +68,7 @@ IMPL_LINK_NOARG(SwBreakDlg, ToggleHdl, weld::ToggleButton&, void) CheckEnable(); } -IMPL_LINK_NOARG(SwBreakDlg, ChangeHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwBreakDlg, ChangeHdl, weld::ComboBox&, void) { CheckEnable(); } @@ -135,7 +135,7 @@ SwBreakDlg::SwBreakDlg(weld::Window *pParent, SwWrtShell &rS) , m_xColumnBtn(m_xBuilder->weld_radio_button("columnrb")) , m_xPageBtn(m_xBuilder->weld_radio_button("pagerb")) , m_xPageCollText(m_xBuilder->weld_label("styleft")) - , m_xPageCollBox(m_xBuilder->weld_combo_box_text("stylelb")) + , m_xPageCollBox(m_xBuilder->weld_combo_box("stylelb")) , m_xPageNumBox(m_xBuilder->weld_check_button("pagenumcb")) , m_xPageNumEdit(m_xBuilder->weld_spin_button("pagenumsb")) , m_xOkBtn(m_xBuilder->weld_button("ok")) diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index eb31be2c98ae..06b04d1c7921 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -141,11 +141,11 @@ SwCharURLPage::SwCharURLPage(TabPageParent pParent, const SfxItemSet& rCoreSet) , m_xTextFT(m_xBuilder->weld_label("textft")) , m_xTextED(m_xBuilder->weld_entry("texted")) , m_xNameED(m_xBuilder->weld_entry("nameed")) - , m_xTargetFrameLB(m_xBuilder->weld_combo_box_text("targetfrmlb")) + , m_xTargetFrameLB(m_xBuilder->weld_combo_box("targetfrmlb")) , m_xURLPB(m_xBuilder->weld_button("urlpb")) , m_xEventPB(m_xBuilder->weld_button("eventpb")) - , m_xVisitedLB(m_xBuilder->weld_combo_box_text("visitedlb")) - , m_xNotVisitedLB(m_xBuilder->weld_combo_box_text("unvisitedlb")) + , m_xVisitedLB(m_xBuilder->weld_combo_box("visitedlb")) + , m_xNotVisitedLB(m_xBuilder->weld_combo_box("unvisitedlb")) , m_xCharStyleContainer(m_xBuilder->weld_widget("charstyle")) { const SfxPoolItem* pItem; diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 15de25952958..9395eae6ba55 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -472,7 +472,7 @@ SwDropCapsPage::SwDropCapsPage(TabPageParent pParent, const SfxItemSet &rSet) , m_xTextText(m_xBuilder->weld_label("labelTXT_TEXT")) , m_xTextEdit(m_xBuilder->weld_entry("entryEDT_TEXT")) , m_xTemplateText(m_xBuilder->weld_label("labelTXT_TEMPLATE")) - , m_xTemplateBox(m_xBuilder->weld_combo_box_text("comboBOX_TEMPLATE")) + , m_xTemplateBox(m_xBuilder->weld_combo_box("comboBOX_TEMPLATE")) , m_xPict(new weld::CustomWeld(*m_xBuilder, "drawingareaWN_EXAMPLE", m_aPict)) { m_aPict.SetDropCapsPage(this); @@ -676,7 +676,7 @@ IMPL_LINK(SwDropCapsPage, MetricValueChangedHdl, weld::MetricSpinButton&, rEdit, ModifyEntry(rEdit.get_widget()); } -IMPL_LINK_NOARG(SwDropCapsPage, SelectHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwDropCapsPage, SelectHdl, weld::ComboBox&, void) { m_aPict.UpdatePaintSettings(); bModified = true; diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index fda0958c26a7..f49b4c259c1a 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -48,9 +48,9 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(TabPageParent pParent, const SfxIte , bModified(false) , bCurNumrule(false) , m_xOutlineStartBX(m_xBuilder->weld_widget("boxOUTLINE")) - , m_xOutlineLvLB(m_xBuilder->weld_combo_box_text("comboLB_OUTLINE_LEVEL")) + , m_xOutlineLvLB(m_xBuilder->weld_combo_box("comboLB_OUTLINE_LEVEL")) , m_xNumberStyleBX(m_xBuilder->weld_widget("boxNUMBER_STYLE")) - , m_xNumberStyleLB(m_xBuilder->weld_combo_box_text("comboLB_NUMBER_STYLE")) + , m_xNumberStyleLB(m_xBuilder->weld_combo_box("comboLB_NUMBER_STYLE")) , m_xEditNumStyleBtn(m_xBuilder->weld_button("editnumstyle")) , m_xNewStartCB(m_xBuilder->weld_check_button("checkCB_NEW_START")) , m_xNewStartBX(m_xBuilder->weld_widget("boxNEW_START")) @@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SwParagraphNumTabPage, LineCountHdl_Impl, weld::ToggleButton&, v m_xRestartBX->set_sensitive(bEnableRestartValue); } -IMPL_LINK_NOARG(SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, weld::ComboBox&, void) { int numSelectPos = m_xNumberStyleLB->get_active(); if (numSelectPos == 0) @@ -337,7 +337,7 @@ bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl( } -IMPL_LINK(SwParagraphNumTabPage, StyleHdl_Impl, weld::ComboBoxText&, rBox, void) +IMPL_LINK(SwParagraphNumTabPage, StyleHdl_Impl, weld::ComboBox&, rBox, void) { bool bEnable = bCurNumrule || rBox.get_active() > 0; m_xNewStartCB->set_sensitive(bEnable); diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index f5fb5f122bc4..2f5b5329ed81 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -220,7 +220,7 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) } static_cast<SwParagraphNumTabPage&>(rPage).EnableNewStart(); - weld::ComboBoxText& rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox(); + weld::ComboBox& rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox(); SfxStyleSheetBasePool* pPool = rView.GetDocShell()->GetStyleSheetPool(); pPool->SetSearchMask(SfxStyleFamily::Pseudo); const SfxStyleSheetBase* pBase = pPool->First(); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 6b9e7f86468e..d08a64899854 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -330,7 +330,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(TabPageParent pParent, , m_xInMarginsRB(m_xBuilder->weld_radio_button("inmargins")) , m_xPrintEmptyPagesCB(m_xBuilder->weld_check_button("blankpages")) , m_xPaperFromSetupCB(m_xBuilder->weld_check_button("papertray")) - , m_xFaxLB(m_xBuilder->weld_combo_box_text("fax")) + , m_xFaxLB(m_xBuilder->weld_combo_box("fax")) { Link<weld::ToggleButton&,void> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl); m_xGrfCB->connect_toggled( aLk ); @@ -493,7 +493,7 @@ void SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst ) m_xFaxLB->set_active(0); } -IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, weld::ComboBox&, void) { bAttrModified=true; } diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 2636527176a9..f8a9ed00178c 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -247,7 +247,7 @@ SwMMResultSaveDialog::~SwMMResultSaveDialog() SwMMResultPrintDialog::SwMMResultPrintDialog(weld::Window* pParent) : GenericDialogController(pParent, "modules/swriter/ui/mmresultprintdialog.ui", "MMResultPrintDialog") , m_xPrinterFT(m_xBuilder->weld_label("printerft")) - , m_xPrinterLB(m_xBuilder->weld_combo_box_text("printers")) + , m_xPrinterLB(m_xBuilder->weld_combo_box("printers")) , m_xPrinterSettingsPB(m_xBuilder->weld_button("printersettings")) , m_xPrintAllRB(m_xBuilder->weld_radio_button("printallrb")) , m_xFromRB(m_xBuilder->weld_radio_button("fromrb")) @@ -719,7 +719,7 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK(SwMMResultPrintDialog, PrinterChangeHdl_Impl, weld::ComboBoxText&, rBox, void) +IMPL_LINK(SwMMResultPrintDialog, PrinterChangeHdl_Impl, weld::ComboBox&, rBox, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem(); diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index bf7fed52c32f..025441896349 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -63,11 +63,11 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ) : GenericDialogController(pParent, "modules/swriter/ui/asciifilterdialog.ui", "AsciiFilterDialog") , m_bSaveLineStatus(true) - , m_xCharSetLB(new TextEncodingBox(m_xBuilder->weld_combo_box_text("charset"))) + , m_xCharSetLB(new TextEncodingBox(m_xBuilder->weld_combo_box("charset"))) , m_xFontFT(m_xBuilder->weld_label("fontft")) - , m_xFontLB(m_xBuilder->weld_combo_box_text("font")) + , m_xFontLB(m_xBuilder->weld_combo_box("font")) , m_xLanguageFT(m_xBuilder->weld_label("languageft")) - , m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box_text("language"))) + , m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("language"))) , m_xCRLF_RB(m_xBuilder->weld_radio_button("crlf")) , m_xCR_RB(m_xBuilder->weld_radio_button("cr")) , m_xLF_RB(m_xBuilder->weld_radio_button("lf")) @@ -320,7 +320,7 @@ LineEnd SwAsciiFilterDlg::GetCRLF() const return eEnd; } -IMPL_LINK_NOARG( SwAsciiFilterDlg, CharSetSelHdl, weld::ComboBoxText&, void ) +IMPL_LINK_NOARG( SwAsciiFilterDlg, CharSetSelHdl, weld::ComboBox&, void ) { LineEnd eOldEnd = GetCRLF(), eEnd = LineEnd(-1); LanguageType nLng = m_xFontLB->get_visible() diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 659a5473df04..db55f59555ae 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1830,7 +1830,7 @@ SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(TabPageParent pParent, , m_xFootnoteNtNumFormatCB(m_xBuilder->weld_check_button("ftnntnumfmt")) , m_xFootnotePrefixFT(m_xBuilder->weld_label("ftnprefix_label")) , m_xFootnotePrefixED(m_xBuilder->weld_entry("ftnprefix")) - , m_xFootnoteNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("ftnnumviewbox"))) + , m_xFootnoteNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("ftnnumviewbox"))) , m_xFootnoteSuffixFT(m_xBuilder->weld_label("ftnsuffix_label")) , m_xFootnoteSuffixED(m_xBuilder->weld_entry("ftnsuffix")) , m_xEndNtAtTextEndCB(m_xBuilder->weld_check_button("endntattextend")) @@ -1840,7 +1840,7 @@ SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(TabPageParent pParent, , m_xEndNtNumFormatCB(m_xBuilder->weld_check_button("endntnumfmt")) , m_xEndPrefixFT(m_xBuilder->weld_label("endprefix_label")) , m_xEndPrefixED(m_xBuilder->weld_entry("endprefix")) - , m_xEndNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("endnumviewbox"))) + , m_xEndNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("endnumviewbox"))) , m_xEndSuffixFT(m_xBuilder->weld_label("endsuffix_label")) , m_xEndSuffixED(m_xBuilder->weld_entry("endsuffix")) { diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 2ba47edbf3d2..a79e88eb14ef 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -123,7 +123,7 @@ SwEnvFormatPage::SwEnvFormatPage(TabPageParent pParent, const SfxItemSet& rSet) , m_xSendLeftField(m_xBuilder->weld_metric_spin_button("leftsender", FUNIT_CM)) , m_xSendTopField(m_xBuilder->weld_metric_spin_button("topsender", FUNIT_CM)) , m_xSendEditButton(m_xBuilder->weld_menu_button("senderedit")) - , m_xSizeFormatBox(m_xBuilder->weld_combo_box_text("format")) + , m_xSizeFormatBox(m_xBuilder->weld_combo_box("format")) , m_xSizeWidthField(m_xBuilder->weld_metric_spin_button("width", FUNIT_CM)) , m_xSizeHeightField(m_xBuilder->weld_metric_spin_button("height", FUNIT_CM)) , m_xPreview(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreview)) @@ -353,7 +353,7 @@ SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl const * pColl, bool return pAddrSet.get(); } -IMPL_LINK_NOARG(SwEnvFormatPage, FormatHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwEnvFormatPage, FormatHdl, weld::ComboBox&, void) { long lWidth; long lHeight; diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 5fa0bda77de6..20f2bd3844b9 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -36,7 +36,7 @@ class SwEnvFormatPage : public SfxTabPage std::unique_ptr<weld::MetricSpinButton> m_xSendLeftField; std::unique_ptr<weld::MetricSpinButton> m_xSendTopField; std::unique_ptr<weld::MenuButton> m_xSendEditButton; - std::unique_ptr<weld::ComboBoxText> m_xSizeFormatBox; + std::unique_ptr<weld::ComboBox> m_xSizeFormatBox; std::unique_ptr<weld::MetricSpinButton> m_xSizeWidthField; std::unique_ptr<weld::MetricSpinButton> m_xSizeHeightField; std::unique_ptr<weld::CustomWeld> m_xPreview; @@ -44,7 +44,7 @@ class SwEnvFormatPage : public SfxTabPage DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void); DECL_LINK(AddrEditHdl, const OString&, void); DECL_LINK(SendEditHdl, const OString&, void); - DECL_LINK(FormatHdl, weld::ComboBoxText&, void); + DECL_LINK(FormatHdl, weld::ComboBox&, void); void SetMinMax(); diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 23974fd60fa4..2c765de7a5d5 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -185,9 +185,9 @@ SwEnvPage::SwEnvPage(TabPageParent pParent, const SfxItemSet& rSet) , m_pDialog(nullptr) , m_pSh(nullptr) , m_xAddrEdit(m_xBuilder->weld_text_view("addredit")) - , m_xDatabaseLB(m_xBuilder->weld_combo_box_text("database")) - , m_xTableLB(m_xBuilder->weld_combo_box_text("table")) - , m_xDBFieldLB(m_xBuilder->weld_combo_box_text("field")) + , m_xDatabaseLB(m_xBuilder->weld_combo_box("database")) + , m_xTableLB(m_xBuilder->weld_combo_box("table")) + , m_xDBFieldLB(m_xBuilder->weld_combo_box("field")) , m_xInsertBT(m_xBuilder->weld_button("insert")) , m_xSenderBox(m_xBuilder->weld_check_button("sender")) , m_xSenderEdit(m_xBuilder->weld_text_view("senderedit")) @@ -229,7 +229,7 @@ SwEnvPage::~SwEnvPage() disposeOnce(); } -IMPL_LINK( SwEnvPage, DatabaseHdl, weld::ComboBoxText&, rListBox, void ) +IMPL_LINK( SwEnvPage, DatabaseHdl, weld::ComboBox&, rListBox, void ) { SwWait aWait( *m_pSh->GetView().GetDocShell(), true ); diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index f69b1ce9f8dc..733d55c6e025 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -225,15 +225,15 @@ SwLabPage::SwLabPage(TabPageParent pParent, const SfxItemSet& rSet) , m_xAddressFrame(m_xBuilder->weld_widget("addressframe")) , m_xAddrBox(m_xBuilder->weld_check_button("address")) , m_xWritingEdit(m_xBuilder->weld_text_view("textview")) - , m_xDatabaseLB(m_xBuilder->weld_combo_box_text("database")) - , m_xTableLB(m_xBuilder->weld_combo_box_text("table")) + , m_xDatabaseLB(m_xBuilder->weld_combo_box("database")) + , m_xTableLB(m_xBuilder->weld_combo_box("table")) , m_xInsertBT(m_xBuilder->weld_button("insert")) - , m_xDBFieldLB(m_xBuilder->weld_combo_box_text("field")) + , m_xDBFieldLB(m_xBuilder->weld_combo_box("field")) , m_xContButton(m_xBuilder->weld_radio_button("continuous")) , m_xSheetButton(m_xBuilder->weld_radio_button("sheet")) - , m_xMakeBox(m_xBuilder->weld_combo_box_text("brand")) - , m_xTypeBox(m_xBuilder->weld_combo_box_text("type")) - , m_xHiddenSortTypeBox(m_xBuilder->weld_combo_box_text("hiddentype")) + , m_xMakeBox(m_xBuilder->weld_combo_box("brand")) + , m_xTypeBox(m_xBuilder->weld_combo_box("type")) + , m_xHiddenSortTypeBox(m_xBuilder->weld_combo_box("hiddentype")) , m_xFormatInfo(m_xBuilder->weld_label("formatinfo")) { WaitObject aWait(pParent.pParent); @@ -294,7 +294,7 @@ IMPL_LINK_NOARG(SwLabPage, AddrHdl, weld::ToggleButton&, void) m_xWritingEdit->grab_focus(); } -IMPL_LINK( SwLabPage, DatabaseHdl, weld::ComboBoxText&, rListBox, void ) +IMPL_LINK( SwLabPage, DatabaseHdl, weld::ComboBox&, rListBox, void ) { sActDBName = m_xDatabaseLB->get_active_text(); @@ -331,7 +331,7 @@ IMPL_LINK_NOARG(SwLabPage, PageHdl, weld::ToggleButton&, void) MakeHdl(*m_xMakeBox); } -IMPL_LINK_NOARG(SwLabPage, MakeHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwLabPage, MakeHdl, weld::ComboBox&, void) { weld::WaitObject aWait(GetParentSwLabDlg()->getDialog()); @@ -384,7 +384,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, weld::ComboBoxText&, void) TypeHdl(*m_xTypeBox); } -IMPL_LINK_NOARG(SwLabPage, TypeHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwLabPage, TypeHdl, weld::ComboBox&, void) { DisplayFormat(); aItem.m_aType = m_xTypeBox->get_active_text(); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 09f6792ccc0c..f0bb88c3746d 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -520,7 +520,7 @@ SwSaveLabelDlg::SwSaveLabelDlg(SwLabDlg* pParent, SwLabRec& rRec) , bSuccess(false) , m_pLabDialog(pParent) , rLabRec(rRec) - , m_xMakeCB(m_xBuilder->weld_combo_box_text("brand")) + , m_xMakeCB(m_xBuilder->weld_combo_box("brand")) , m_xTypeED(m_xBuilder->weld_entry("type")) , m_xOKPB(m_xBuilder->weld_button("ok")) { @@ -577,7 +577,7 @@ void SwSaveLabelDlg::Modify() m_xOKPB->set_sensitive(!m_xMakeCB->get_active_text().isEmpty() && !m_xTypeED->get_text().isEmpty()); } -IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyComboHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyComboHdl, weld::ComboBox&, void) { Modify(); } diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 7415792f4642..69cddc7c38e8 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -117,13 +117,13 @@ class SwSaveLabelDlg : public weld::GenericDialogController SwLabDlg* m_pLabDialog; SwLabRec& rLabRec; - std::unique_ptr<weld::ComboBoxText> m_xMakeCB; + std::unique_ptr<weld::ComboBox> m_xMakeCB; std::unique_ptr<weld::Entry> m_xTypeED; std::unique_ptr<weld::Button> m_xOKPB; DECL_LINK(OkHdl, weld::Button&, void); DECL_LINK(ModifyEntryHdl, weld::Entry&, void); - DECL_LINK(ModifyComboHdl, weld::ComboBoxText&, void); + DECL_LINK(ModifyComboHdl, weld::ComboBox&, void); void Modify(); diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 8fe65957ee95..a26f1b9a50cd 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -32,23 +32,23 @@ class SwLabPage : public SfxTabPage std::unique_ptr<weld::Widget> m_xAddressFrame; std::unique_ptr<weld::CheckButton> m_xAddrBox; std::unique_ptr<weld::TextView> m_xWritingEdit; - std::unique_ptr<weld::ComboBoxText> m_xDatabaseLB; - std::unique_ptr<weld::ComboBoxText> m_xTableLB; + std::unique_ptr<weld::ComboBox> m_xDatabaseLB; + std::unique_ptr<weld::ComboBox> m_xTableLB; std::unique_ptr<weld::Button> m_xInsertBT; - std::unique_ptr<weld::ComboBoxText> m_xDBFieldLB; + std::unique_ptr<weld::ComboBox> m_xDBFieldLB; std::unique_ptr<weld::RadioButton> m_xContButton; std::unique_ptr<weld::RadioButton> m_xSheetButton; - std::unique_ptr<weld::ComboBoxText> m_xMakeBox; - std::unique_ptr<weld::ComboBoxText> m_xTypeBox; - std::unique_ptr<weld::ComboBoxText> m_xHiddenSortTypeBox; + std::unique_ptr<weld::ComboBox> m_xMakeBox; + std::unique_ptr<weld::ComboBox> m_xTypeBox; + std::unique_ptr<weld::ComboBox> m_xHiddenSortTypeBox; std::unique_ptr<weld::Label> m_xFormatInfo; DECL_LINK(AddrHdl, weld::ToggleButton&, void); - DECL_LINK(DatabaseHdl, weld::ComboBoxText&, void ); + DECL_LINK(DatabaseHdl, weld::ComboBox&, void ); DECL_LINK(FieldHdl, weld::Button&, void); DECL_LINK(PageHdl, weld::ToggleButton&, void); - DECL_LINK(MakeHdl, weld::ComboBoxText&, void); - DECL_LINK(TypeHdl, weld::ComboBoxText&, void); + DECL_LINK(MakeHdl, weld::ComboBox&, void); + DECL_LINK(TypeHdl, weld::ComboBox&, void); void DisplayFormat (); SwLabRec* GetSelectedEntryPos(); diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 9e7f661872f1..77aa92b22293 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -407,7 +407,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) static_cast<SwParagraphNumTabPage&>(rPage).DisableOutline() ; static_cast<SwParagraphNumTabPage&>(rPage).DisableNumbering(); }//<-end - weld::ComboBoxText& rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox(); + weld::ComboBox& rBox = static_cast<SwParagraphNumTabPage&>(rPage).GetStyleBox(); SfxStyleSheetBasePool* pPool = pWrtShell->GetView().GetDocShell()->GetStyleSheetPool(); pPool->SetSearchMask(SfxStyleFamily::Pseudo); const SfxStyleSheetBase* pBase = pPool->First(); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 1332b6040ae4..6aad3e625019 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -163,7 +163,7 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh) // create TabPage m_pTabPage = static_cast<SwColumnPage*>(SwColumnPage::Create(TabPageParent(m_xContentArea.get(), this), pColPgSet).get()); m_pTabPage->GetApplyLabel()->show(); - weld::ComboBoxText* pApplyToLB = m_pTabPage->GetApplyComboBox(); + weld::ComboBox* pApplyToLB = m_pTabPage->GetApplyComboBox(); pApplyToLB->show(); if (pCurrSection && (!m_rWrtShell.HasSelection() || 0 != nFullSectCnt)) @@ -212,12 +212,12 @@ SwColumnDlg::~SwColumnDlg() m_pTabPage.disposeAndClear(); } -IMPL_LINK(SwColumnDlg, ObjectListBoxHdl, weld::ComboBoxText&, rBox, void) +IMPL_LINK(SwColumnDlg, ObjectListBoxHdl, weld::ComboBox&, rBox, void) { ObjectHdl(&rBox); } -void SwColumnDlg::ObjectHdl(const weld::ComboBoxText* pBox) +void SwColumnDlg::ObjectHdl(const weld::ComboBox* pBox) { SfxItemSet* pSet = EvalCurrentSelection(); @@ -225,7 +225,7 @@ void SwColumnDlg::ObjectHdl(const weld::ComboBoxText* pBox) { m_pTabPage->FillItemSet(pSet); } - weld::ComboBoxText* pApplyToLB = m_pTabPage->GetApplyComboBox(); + weld::ComboBox* pApplyToLB = m_pTabPage->GetApplyComboBox(); m_nOldSelection = pApplyToLB->get_active_id().toInt32(); long nWidth = m_nSelectionWidth; switch(m_nOldSelection) @@ -401,9 +401,9 @@ SwColumnPage::SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet) , m_xLineHeightLbl(m_xBuilder->weld_label("lineheightft")) , m_xLineHeightEdit(m_xBuilder->weld_metric_spin_button("lineheightmf", FUNIT_PERCENT)) , m_xLinePosLbl(m_xBuilder->weld_label("lineposft")) - , m_xLinePosDLB(m_xBuilder->weld_combo_box_text("lineposlb")) + , m_xLinePosDLB(m_xBuilder->weld_combo_box("lineposlb")) , m_xTextDirectionFT(m_xBuilder->weld_label("textdirectionft")) - , m_xTextDirectionLB(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box_text("textdirectionlb"))) + , m_xTextDirectionLB(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box("textdirectionlb"))) , m_xLineColorDLB(new ColorListBox(m_xBuilder->weld_menu_button("colorlb"), GetFrameWeld())) , m_xLineTypeDLB(new SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb"))) , m_xEd1(new SwPercentField(m_xBuilder->weld_metric_spin_button("width1mf", FUNIT_CM))) @@ -415,7 +415,7 @@ SwColumnPage::SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet) , m_xPgeExampleWN(new weld::CustomWeld(*m_xBuilder, "pageexample", m_aPgeExampleWN)) , m_xFrameExampleWN(new weld::CustomWeld(*m_xBuilder, "frameexample", m_aFrameExampleWN)) , m_xApplyToFT(m_xBuilder->weld_label("applytoft")) - , m_xApplyToLB(m_xBuilder->weld_combo_box_text("applytolb")) + , m_xApplyToLB(m_xBuilder->weld_combo_box("applytolb")) { connectPercentField(*m_xEd1); connectPercentField(*m_xEd2); @@ -632,7 +632,7 @@ bool SwColumnPage::FillItemSet(SfxItemSet *rSet) } // update ColumnManager -IMPL_LINK_NOARG( SwColumnPage, UpdateColMgrListBox, weld::ComboBoxText&, void ) +IMPL_LINK_NOARG( SwColumnPage, UpdateColMgrListBox, weld::ComboBox&, void ) { UpdateColMgr(*m_xLineWidthEdit); } diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index cc42c9a993f3..05c48712e6f6 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -54,14 +54,14 @@ class SwSequenceOptionDialog : public weld::GenericDialogController SwView& m_rView; OUString m_aFieldTypeName; - std::unique_ptr<weld::ComboBoxText> m_xLbLevel; + std::unique_ptr<weld::ComboBox> m_xLbLevel; std::unique_ptr<weld::Entry> m_xEdDelim; - std::unique_ptr<weld::ComboBoxText> m_xLbCharStyle; + std::unique_ptr<weld::ComboBox> m_xLbCharStyle; std::unique_ptr<weld::CheckButton> m_xApplyBorderAndShadowCB; //#i61007# order of captions - std::unique_ptr<weld::ComboBoxText> m_xLbCaptionOrder; + std::unique_ptr<weld::ComboBox> m_xLbCaptionOrder; public: SwSequenceOptionDialog(weld::Window *pParent, SwView &rV, const OUString& rSeqFieldType); @@ -440,11 +440,11 @@ SwSequenceOptionDialog::SwSequenceOptionDialog(weld::Window *pParent, SwView &rV : GenericDialogController(pParent, "modules/swriter/ui/captionoptions.ui", "CaptionOptionsDialog") , m_rView(rV) , m_aFieldTypeName(rSeqFieldType) - , m_xLbLevel(m_xBuilder->weld_combo_box_text("level")) + , m_xLbLevel(m_xBuilder->weld_combo_box("level")) , m_xEdDelim(m_xBuilder->weld_entry("separator")) - , m_xLbCharStyle(m_xBuilder->weld_combo_box_text("style")) + , m_xLbCharStyle(m_xBuilder->weld_combo_box("style")) , m_xApplyBorderAndShadowCB(m_xBuilder->weld_check_button("border_and_shadow")) - , m_xLbCaptionOrder(m_xBuilder->weld_combo_box_text("caption_order")) + , m_xLbCaptionOrder(m_xBuilder->weld_combo_box("caption_order")) { SwWrtShell &rSh = m_rView.GetWrtShell(); diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index b23705100f41..8a85adf01573 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -70,7 +70,7 @@ class SwMMResultPrintDialog : public weld::GenericDialogController VclPtr<Printer> m_pTempPrinter; std::unique_ptr<weld::Label> m_xPrinterFT; - std::unique_ptr<weld::ComboBoxText> m_xPrinterLB; + std::unique_ptr<weld::ComboBox> m_xPrinterLB; std::unique_ptr<weld::Button> m_xPrinterSettingsPB; std::unique_ptr<weld::RadioButton> m_xPrintAllRB; std::unique_ptr<weld::RadioButton> m_xFromRB; @@ -79,7 +79,7 @@ class SwMMResultPrintDialog : public weld::GenericDialogController std::unique_ptr<weld::SpinButton> m_xToNF; std::unique_ptr<weld::Button> m_xOKButton; - DECL_LINK(PrinterChangeHdl_Impl, weld::ComboBoxText&, void ); + DECL_LINK(PrinterChangeHdl_Impl, weld::ComboBox&, void ); DECL_LINK(PrintHdl_Impl, weld::Button&, void); DECL_LINK(PrinterSetupHdl_Impl, weld::Button&, void ); DECL_LINK(DocumentSelectionHdl_Impl, weld::ToggleButton&, void); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index dd0c76f59f7b..77ec50bddfd2 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1008,12 +1008,12 @@ class SwCreateAuthEntryDlg_Impl : public weld::GenericDialogController std::unique_ptr<weld::Container> m_xBox; std::unique_ptr<weld::Container> m_xLeft; std::unique_ptr<weld::Container> m_xRight; - std::unique_ptr<weld::ComboBoxText> m_xTypeListBox; - std::unique_ptr<weld::ComboBoxText> m_xIdentifierBox; + std::unique_ptr<weld::ComboBox> m_xTypeListBox; + std::unique_ptr<weld::ComboBox> m_xIdentifierBox; - DECL_LINK(IdentifierHdl, weld::ComboBoxText&, void); + DECL_LINK(IdentifierHdl, weld::ComboBox&, void); DECL_LINK(ShortNameHdl, weld::Entry&, void); - DECL_LINK(EnableHdl, weld::ComboBoxText&, void); + DECL_LINK(EnableHdl, weld::ComboBox&, void); public: SwCreateAuthEntryDlg_Impl(weld::Window* pParent, @@ -1515,7 +1515,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent, m_aFixedTexts.back()->show(); if( AUTH_FIELD_AUTHORITY_TYPE == aCurInfo.nToxField ) { - m_xTypeListBox = m_aBuilders.back()->weld_combo_box_text("listbox"); + m_xTypeListBox = m_aBuilders.back()->weld_combo_box("listbox"); if (bLeft) m_aOrigContainers.back()->move(m_xTypeListBox.get(), m_xLeft.get()); else @@ -1537,7 +1537,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent, } else if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField && !m_bNewEntryMode) { - m_xIdentifierBox = m_aBuilders.back()->weld_combo_box_text("combobox"); + m_xIdentifierBox = m_aBuilders.back()->weld_combo_box("combobox"); if (bLeft) m_aOrigContainers.back()->move(m_xIdentifierBox.get(), m_xLeft.get()); else @@ -1624,7 +1624,7 @@ OUString SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) cons return OUString(); } -IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, weld::ComboBoxText&, rBox, void) +IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, weld::ComboBox&, rBox, void) { const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>( rWrtSh.GetFieldType(SwFieldIds::TableOfAuthorities, OUString())); @@ -1660,7 +1660,7 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, weld::Entry&, rEdit, void) } } -IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, weld::ComboBoxText&, rBox, void) +IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, weld::ComboBox&, rBox, void) { m_xOKBT->set_sensitive(m_bNameAllowed && rBox.get_active() != -1); }; diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 73ebbb95f970..f3693cb6735d 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -72,21 +72,21 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(TabPageParent pParent, bool bEN, , pSh(nullptr) , bPosDoc(false) , bEndNote(bEN) - , m_xNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("numberinglb"))) + , m_xNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("numberinglb"))) , m_xOffsetLbl(m_xBuilder->weld_label("offset")) , m_xOffsetField(m_xBuilder->weld_spin_button("offsetnf")) - , m_xNumCountBox(m_xBuilder->weld_combo_box_text("countinglb")) + , m_xNumCountBox(m_xBuilder->weld_combo_box("countinglb")) , m_xPrefixED(m_xBuilder->weld_entry("prefix")) , m_xSuffixED(m_xBuilder->weld_entry("suffix")) , m_xPosFT(m_xBuilder->weld_label("pos")) , m_xPosPageBox(m_xBuilder->weld_radio_button("pospagecb")) , m_xPosChapterBox(m_xBuilder->weld_radio_button("posdoccb")) , m_xStylesContainer(m_xBuilder->weld_widget("allstyles")) - , m_xParaTemplBox(m_xBuilder->weld_combo_box_text("parastylelb")) + , m_xParaTemplBox(m_xBuilder->weld_combo_box("parastylelb")) , m_xPageTemplLbl(m_xBuilder->weld_label("pagestyleft")) - , m_xPageTemplBox(m_xBuilder->weld_combo_box_text("pagestylelb")) - , m_xFootnoteCharAnchorTemplBox(m_xBuilder->weld_combo_box_text("charanchorstylelb")) - , m_xFootnoteCharTextTemplBox(m_xBuilder->weld_combo_box_text("charstylelb")) + , m_xPageTemplBox(m_xBuilder->weld_combo_box("pagestylelb")) + , m_xFootnoteCharAnchorTemplBox(m_xBuilder->weld_combo_box("charanchorstylelb")) + , m_xFootnoteCharTextTemplBox(m_xBuilder->weld_combo_box("charstylelb")) , m_xContEdit(m_xBuilder->weld_entry("conted")) , m_xContFromEdit(m_xBuilder->weld_entry("contfromed")) { @@ -273,7 +273,7 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl, weld::Button&, void) m_xPageTemplBox->set_sensitive(false); } -IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl, weld::ComboBox&, void) { bool bEnable = true; if (m_xNumCountBox->get_count() - 1 != m_xNumCountBox->get_active()) diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 8c192a620ca7..3a2c396cd8d1 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -38,18 +38,18 @@ class SwEndNoteOptionPage : public SfxTabPage std::unique_ptr<SwNumberingTypeListBox> m_xNumViewBox; std::unique_ptr<weld::Label> m_xOffsetLbl; std::unique_ptr<weld::SpinButton> m_xOffsetField; - std::unique_ptr<weld::ComboBoxText> m_xNumCountBox; + std::unique_ptr<weld::ComboBox> m_xNumCountBox; std::unique_ptr<weld::Entry> m_xPrefixED; std::unique_ptr<weld::Entry> m_xSuffixED; std::unique_ptr<weld::Label> m_xPosFT; std::unique_ptr<weld::RadioButton> m_xPosPageBox; std::unique_ptr<weld::RadioButton> m_xPosChapterBox; std::unique_ptr<weld::Widget> m_xStylesContainer; - std::unique_ptr<weld::ComboBoxText> m_xParaTemplBox; + std::unique_ptr<weld::ComboBox> m_xParaTemplBox; std::unique_ptr<weld::Label> m_xPageTemplLbl; - std::unique_ptr<weld::ComboBoxText> m_xPageTemplBox; - std::unique_ptr<weld::ComboBoxText> m_xFootnoteCharAnchorTemplBox; - std::unique_ptr<weld::ComboBoxText> m_xFootnoteCharTextTemplBox; + std::unique_ptr<weld::ComboBox> m_xPageTemplBox; + std::unique_ptr<weld::ComboBox> m_xFootnoteCharAnchorTemplBox; + std::unique_ptr<weld::ComboBox> m_xFootnoteCharTextTemplBox; std::unique_ptr<weld::Entry> m_xContEdit; std::unique_ptr<weld::Entry> m_xContFromEdit; @@ -58,7 +58,7 @@ class SwEndNoteOptionPage : public SfxTabPage DECL_LINK(PosPageHdl, weld::Button&, void); DECL_LINK(PosChapterHdl, weld::Button&, void); - DECL_LINK(NumCountHdl, weld::ComboBoxText&, void); + DECL_LINK(NumCountHdl, weld::ComboBox&, void); public: SwEndNoteOptionPage(TabPageParent pParent, bool bEndNote, const SfxItemSet &rSet); diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 07f85c6e0585..418ee444d47b 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -72,9 +72,9 @@ SwLineNumberingDlg::SwLineNumberingDlg(const SwView& rVw) , m_xDivIntervalNF(m_xBuilder->weld_spin_button("linesspin")) , m_xDivRowsFT(m_xBuilder->weld_widget("lines")) , m_xNumIntervalNF(m_xBuilder->weld_spin_button("intervalspin")) - , m_xCharStyleLB(m_xBuilder->weld_combo_box_text("styledropdown")) - , m_xFormatLB(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("formatdropdown"))) - , m_xPosLB(m_xBuilder->weld_combo_box_text("positiondropdown")) + , m_xCharStyleLB(m_xBuilder->weld_combo_box("styledropdown")) + , m_xFormatLB(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("formatdropdown"))) + , m_xPosLB(m_xBuilder->weld_combo_box("positiondropdown")) , m_xOffsetMF(m_xBuilder->weld_metric_spin_button("spacingspin", FUNIT_CM)) , m_xDivisorED(m_xBuilder->weld_entry("textentry")) , m_xCountEmptyLinesCB(m_xBuilder->weld_check_button("blanklines")) diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 997ba0f5a4ad..be703641970b 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -74,13 +74,13 @@ SwNumPositionTabPage::SwNumPositionTabPage(TabPageParent pParent, const SfxItemS , 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")) @@ -535,7 +535,7 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) m_xIndentAtMF->set_unit( eMetric ); } -IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl, weld::ComboBox&, void) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -700,7 +700,7 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, weld::ToggleButton&, rBox, void ) bLastRelative = bOn; } -IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl, weld::ComboBox&, void) { // determine value to be set at the chosen list levels SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB; diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index ea75b1761586..9c43cab7df68 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -392,9 +392,9 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(TabPageParent pPage, , pCollNames(nullptr) , nActLevel(1) , m_xLevelLB(m_xBuilder->weld_tree_view("level")) - , m_xCollBox(m_xBuilder->weld_combo_box_text("style")) - , m_xNumberBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box_text("numbering"))) - , m_xCharFormatLB(m_xBuilder->weld_combo_box_text("charstyle")) + , m_xCollBox(m_xBuilder->weld_combo_box("style")) + , m_xNumberBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("numbering"))) + , m_xCharFormatLB(m_xBuilder->weld_combo_box("charstyle")) , m_xAllLevelFT(m_xBuilder->weld_label("sublevelsft")) , m_xAllLevelNF(m_xBuilder->weld_spin_button("sublevelsnf")) , m_xPrefixED(m_xBuilder->weld_entry("prefix")) @@ -568,7 +568,7 @@ IMPL_LINK(SwOutlineSettingsTabPage, ToggleComplete, weld::SpinButton&, rEdit, vo SetModified(); } -IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, weld::ComboBoxText&, rBox, void ) +IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, weld::ComboBox&, rBox, void ) { sal_uInt8 i; @@ -616,7 +616,7 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CollSelectGetFocus, weld::Widget&, voi aSaveCollNames[i] = pCollNames[i]; } -IMPL_LINK_NOARG(SwOutlineSettingsTabPage, NumberSelect, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, NumberSelect, weld::ComboBox&, void) { sal_uInt16 nMask = 1; SvxNumType nNumberType = m_xNumberBox->GetSelectedNumberingType(); @@ -667,7 +667,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, weld::SpinButton&, rEdit, vo SetModified(); } -IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFormatHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFormatHdl, weld::ComboBox&, void) { OUString sEntry = m_xCharFormatLB->get_active_text(); sal_uInt16 nMask = 1; diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index c861014e804e..d7e2718141b7 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -111,7 +111,7 @@ SwFootNotePage::SwFootNotePage(TabPageParent pParent, const SfxItemSet &rSet) , m_xMaxHeightBtn(m_xBuilder->weld_radio_button("maxheight")) , m_xMaxHeightEdit(m_xBuilder->weld_metric_spin_button("maxheightsb", FUNIT_CM)) , m_xDistEdit(m_xBuilder->weld_metric_spin_button("spacetotext", FUNIT_CM)) - , m_xLinePosBox(m_xBuilder->weld_combo_box_text("position")) + , m_xLinePosBox(m_xBuilder->weld_combo_box("position")) , m_xLineTypeBox(new SvtLineListBox(m_xBuilder->weld_menu_button("style"))) , m_xLineWidthEdit(m_xBuilder->weld_metric_spin_button("thickness", FUNIT_POINT)) , m_xLineColorBox(new ColorListBox(m_xBuilder->weld_menu_button("color"), GetFrameWeld())) diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 7fa7e238554a..ff53d13a30ed 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -103,17 +103,17 @@ SwSortDlg::SwSortDlg(weld::Window* pParent, SwWrtShell &rShell) , m_xColLbl(m_xBuilder->weld_label("column")) , m_xKeyCB1(m_xBuilder->weld_check_button("key1")) , m_xColEdt1(m_xBuilder->weld_spin_button("colsb1")) - , m_xTypDLB1(m_xBuilder->weld_combo_box_text("typelb1")) + , m_xTypDLB1(m_xBuilder->weld_combo_box("typelb1")) , m_xSortUp1RB(m_xBuilder->weld_radio_button("up1")) , m_xSortDn1RB(m_xBuilder->weld_radio_button("down1")) , m_xKeyCB2(m_xBuilder->weld_check_button("key2")) , m_xColEdt2(m_xBuilder->weld_spin_button("colsb2")) - , m_xTypDLB2(m_xBuilder->weld_combo_box_text("typelb2")) + , m_xTypDLB2(m_xBuilder->weld_combo_box("typelb2")) , m_xSortUp2RB(m_xBuilder->weld_radio_button("up2")) , m_xSortDn2RB(m_xBuilder->weld_radio_button("down2")) , m_xKeyCB3(m_xBuilder->weld_check_button("key3")) , m_xColEdt3(m_xBuilder->weld_spin_button("colsb3")) - , m_xTypDLB3(m_xBuilder->weld_combo_box_text("typelb3")) + , m_xTypDLB3(m_xBuilder->weld_combo_box("typelb3")) , m_xSortUp3RB(m_xBuilder->weld_radio_button("up3")) , m_xSortDn3RB(m_xBuilder->weld_radio_button("down3")) , m_xColumnRB(m_xBuilder->weld_radio_button("columns")) @@ -122,7 +122,7 @@ SwSortDlg::SwSortDlg(weld::Window* pParent, SwWrtShell &rShell) , m_xDelimFreeRB(m_xBuilder->weld_radio_button("character")) , m_xDelimEdt(m_xBuilder->weld_entry("separator")) , m_xDelimPB(m_xBuilder->weld_button("delimpb")) - , m_xLangLB(new LanguageBox(m_xBuilder->weld_combo_box_text("langlb"))) + , m_xLangLB(new LanguageBox(m_xBuilder->weld_combo_box("langlb"))) , m_xCaseCB(m_xBuilder->weld_check_button("matchcase")) , aColText(SwResId(STR_COL)) , aRowText(SwResId(STR_ROW)) @@ -376,12 +376,12 @@ IMPL_LINK( SwSortDlg, CheckHdl, weld::ToggleButton&, rControl, void ) } } -IMPL_LINK( SwSortDlg, LanguageListBoxHdl, weld::ComboBoxText&, rLBox, void ) +IMPL_LINK( SwSortDlg, LanguageListBoxHdl, weld::ComboBox&, rLBox, void ) { LanguageHdl(&rLBox); } -void SwSortDlg::LanguageHdl(weld::ComboBoxText const* pLBox) +void SwSortDlg::LanguageHdl(weld::ComboBox const* pLBox) { Sequence < OUString > aSeq( GetAppCollator().listCollatorAlgorithms( LanguageTag( m_xLangLB->get_active_id()).getLocale() )); @@ -390,13 +390,13 @@ void SwSortDlg::LanguageHdl(weld::ComboBoxText const* pLBox) m_xColRes.reset(new CollatorResource); const int nLstBoxCnt = 3; - weld::ComboBoxText* aLstArr[ nLstBoxCnt ] = { m_xTypDLB1.get(), m_xTypDLB2.get(), m_xTypDLB3.get() }; + weld::ComboBox* aLstArr[ nLstBoxCnt ] = { m_xTypDLB1.get(), m_xTypDLB2.get(), m_xTypDLB3.get() }; sal_uInt16* const aTypeArr[ nLstBoxCnt ] = { &nType1, &nType2, &nType3 }; OUString aOldStrArr[ nLstBoxCnt ]; for( int n = 0; n < nLstBoxCnt; ++n ) { - weld::ComboBoxText* pL = aLstArr[ n ]; + weld::ComboBox* pL = aLstArr[ n ]; OUString sUserData = pL->get_active_id(); if (!sUserData.isEmpty()) aOldStrArr[ n ] = sUserData; @@ -414,7 +414,7 @@ void SwSortDlg::LanguageHdl(weld::ComboBoxText const* pLBox) for( int n = 0; n < nLstBoxCnt; ++n ) { - weld::ComboBoxText* pL = aLstArr[ n ]; + weld::ComboBox* pL = aLstArr[ n ]; pL->append(sAlg, sUINm); if (pLBox && sAlg == aOldStrArr[n]) pL->set_active_id(sAlg); @@ -423,7 +423,7 @@ void SwSortDlg::LanguageHdl(weld::ComboBoxText const* pLBox) for( int n = 0; n < nLstBoxCnt; ++n ) { - weld::ComboBoxText* pL = aLstArr[ n ]; + weld::ComboBox* pL = aLstArr[ n ]; if( !pLBox ) pL->set_active(*aTypeArr[n]); else if (pL->get_active() == -1) diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 06d9728cc0c7..f1f3a023d3ea 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -158,7 +158,7 @@ SwTitlePageDlg::SwTitlePageDlg(weld::Window *pParent) , m_xRestartNumberingNF(m_xBuilder->weld_spin_button("NF_RESTART_NUMBERING")) , m_xSetPageNumberCB(m_xBuilder->weld_check_button("CB_SET_PAGE_NUMBER")) , m_xSetPageNumberNF(m_xBuilder->weld_spin_button("NF_SET_PAGE_NUMBER")) - , m_xPagePropertiesLB(m_xBuilder->weld_combo_box_text("LB_PAGE_PROPERTIES")) + , m_xPagePropertiesLB(m_xBuilder->weld_combo_box("LB_PAGE_PROPERTIES")) , m_xPagePropertiesPB(m_xBuilder->weld_button("PB_PAGE_PROPERTIES")) , m_xOkPB(m_xBuilder->weld_button("ok")) { diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 7be5d0a313c6..8e61980b1dff 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -88,7 +88,7 @@ SwFormatTablePage::SwFormatTablePage(TabPageParent pParent, const SfxItemSet& rS , m_xTopMF(m_xBuilder->weld_metric_spin_button("abovemf", FUNIT_CM)) , m_xBottomFT(m_xBuilder->weld_label("belowft")) , m_xBottomMF(m_xBuilder->weld_metric_spin_button("belowmf", FUNIT_CM)) - , m_xTextDirectionLB(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box_text("textdirection"))) + , m_xTextDirectionLB(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box("textdirection"))) , m_xProperties(m_xBuilder->weld_widget("properties")) { //lock these to initial sizes so they don't change on percent to non percent change @@ -1196,7 +1196,7 @@ SwTextFlowPage::SwTextFlowPage(TabPageParent pParent, const SfxItemSet& rSet) , m_xPgBrkBeforeRB(m_xBuilder->weld_radio_button("before")) , m_xPgBrkAfterRB(m_xBuilder->weld_radio_button("after")) , m_xPageCollCB(m_xBuilder->weld_check_button("pagestyle")) - , m_xPageCollLB(m_xBuilder->weld_combo_box_text("pagestylelb")) + , m_xPageCollLB(m_xBuilder->weld_combo_box("pagestylelb")) , m_xPageNoCB(m_xBuilder->weld_check_button("pagenoft")) , m_xPageNoNF(m_xBuilder->weld_spin_button("pagenonf")) , m_xSplitCB(m_xBuilder->weld_check_button("split")) @@ -1205,8 +1205,8 @@ SwTextFlowPage::SwTextFlowPage(TabPageParent pParent, const SfxItemSet& rSet) , m_xHeadLineCB(m_xBuilder->weld_check_button("headline")) , m_xRepeatHeaderCombo(m_xBuilder->weld_widget("repeatheader")) , m_xRepeatHeaderNF(m_xBuilder->weld_spin_button("repeatheadernf")) - , m_xTextDirectionLB(m_xBuilder->weld_combo_box_text("textdirection")) - , m_xVertOrientLB(m_xBuilder->weld_combo_box_text("vertorient")) + , m_xTextDirectionLB(m_xBuilder->weld_combo_box("textdirection")) + , m_xVertOrientLB(m_xBuilder->weld_combo_box("vertorient")) { m_xPgBrkCB->connect_toggled(LINK(this, SwTextFlowPage, PageBreakHdl_Impl)); m_xPgBrkBeforeRB->connect_toggled( diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 6586129f8f1a..71e0c8b7ae77 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -707,7 +707,7 @@ void SwDBManager::ImportDBEntry(SwWrtShell* pSh) } } -bool SwDBManager::GetTableNames(weld::ComboBoxText& rBox, const OUString& rDBName) +bool SwDBManager::GetTableNames(weld::ComboBox& rBox, const OUString& rDBName) { bool bRet = false; OUString sOldTableName(rBox.get_active_text()); @@ -767,7 +767,7 @@ void SwDBManager::GetColumnNames(ListBox* pListBox, GetColumnNames(pListBox, xConnection, rTableName); } -void SwDBManager::GetColumnNames(weld::ComboBoxText& rBox, +void SwDBManager::GetColumnNames(weld::ComboBox& rBox, const OUString& rDBName, const OUString& rTableName) { SwDBData aData; @@ -804,7 +804,7 @@ void SwDBManager::GetColumnNames(ListBox* pListBox, } } -void SwDBManager::GetColumnNames(weld::ComboBoxText& rBox, +void SwDBManager::GetColumnNames(weld::ComboBox& rBox, uno::Reference< sdbc::XConnection> const & xConnection, const OUString& rTableName) { diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx b/sw/source/uibase/dialog/watermarkdialog.cxx index f3fbdb2bd907..2b794e129b8e 100644 --- a/sw/source/uibase/dialog/watermarkdialog.cxx +++ b/sw/source/uibase/dialog/watermarkdialog.cxx @@ -24,7 +24,7 @@ SwWatermarkDialog::SwWatermarkDialog(weld::Window* pParent, SfxBindings& rBindin , m_rBindings(rBindings) , m_xTextInput(m_xBuilder->weld_entry("TextInput")) , m_xOKButton(m_xBuilder->weld_button("ok")) - , m_xFont(m_xBuilder->weld_combo_box_text("FontBox")) + , m_xFont(m_xBuilder->weld_combo_box("FontBox")) , m_xAngle(m_xBuilder->weld_metric_spin_button("Angle", FUNIT_DEGREE)) , m_xTransparency(m_xBuilder->weld_metric_spin_button("Transparency", FUNIT_PERCENT)) , m_xColor(new ColorListBox(m_xBuilder->weld_menu_button("Color"), m_xDialog.get())) diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index 81c75663fd6c..43ee8452a18d 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -37,14 +37,14 @@ class SwAsciiFilterDlg : public weld::GenericDialogController std::unique_ptr<TextEncodingBox> m_xCharSetLB; std::unique_ptr<weld::Label> m_xFontFT; - std::unique_ptr<weld::ComboBoxText> m_xFontLB; + std::unique_ptr<weld::ComboBox> m_xFontLB; std::unique_ptr<weld::Label> m_xLanguageFT; std::unique_ptr<LanguageBox> m_xLanguageLB; std::unique_ptr<weld::RadioButton> m_xCRLF_RB; std::unique_ptr<weld::RadioButton> m_xCR_RB; std::unique_ptr<weld::RadioButton> m_xLF_RB; - DECL_LINK(CharSetSelHdl, weld::ComboBoxText&, void); + DECL_LINK(CharSetSelHdl, weld::ComboBox&, void); DECL_LINK(LineEndHdl, weld::ToggleButton&, void); void SetCRLF( LineEnd eEnd ); LineEnd GetCRLF() const; diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 70af5ad61c51..fe79a5eb9a09 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -35,7 +35,7 @@ class SwBreakDlg : public weld::GenericDialogController std::unique_ptr<weld::RadioButton> m_xColumnBtn; std::unique_ptr<weld::RadioButton> m_xPageBtn; std::unique_ptr<weld::Label> m_xPageCollText; - std::unique_ptr<weld::ComboBoxText> m_xPageCollBox; + std::unique_ptr<weld::ComboBox> m_xPageCollBox; std::unique_ptr<weld::CheckButton> m_xPageNumBox; std::unique_ptr<weld::SpinButton> m_xPageNumEdit; std::unique_ptr<weld::Button> m_xOkBtn; @@ -48,7 +48,7 @@ class SwBreakDlg : public weld::GenericDialogController bool bHtmlMode; DECL_LINK(ToggleHdl, weld::ToggleButton&, void); - DECL_LINK(ChangeHdl, weld::ComboBoxText&, void); + DECL_LINK(ChangeHdl, weld::ComboBox&, void); DECL_LINK(PageNumHdl, weld::ToggleButton&, void); DECL_LINK(PageNumModifyHdl, weld::SpinButton&, void); DECL_LINK(OkHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 808c60d5de6b..668613c4d627 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -54,11 +54,11 @@ class SwCharURLPage : public SfxTabPage std::unique_ptr<weld::Label> m_xTextFT; std::unique_ptr<weld::Entry> m_xTextED; std::unique_ptr<weld::Entry> m_xNameED; - std::unique_ptr<weld::ComboBoxText> m_xTargetFrameLB; + std::unique_ptr<weld::ComboBox> m_xTargetFrameLB; std::unique_ptr<weld::Button> m_xURLPB; std::unique_ptr<weld::Button> m_xEventPB; - std::unique_ptr<weld::ComboBoxText> m_xVisitedLB; - std::unique_ptr<weld::ComboBoxText> m_xNotVisitedLB; + std::unique_ptr<weld::ComboBox> m_xVisitedLB; + std::unique_ptr<weld::ComboBox> m_xNotVisitedLB; std::unique_ptr<weld::Widget> m_xCharStyleContainer; DECL_LINK(InsertFileHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index aab97048e2b5..322bed0ffac3 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -63,9 +63,9 @@ class SwColumnDlg : public weld::GenericDialogController std::unique_ptr<weld::Container> m_xContentArea; std::unique_ptr<weld::Button> m_xOkButton; - DECL_LINK(ObjectListBoxHdl, weld::ComboBoxText&, void); + DECL_LINK(ObjectListBoxHdl, weld::ComboBox&, void); DECL_LINK(OkHdl, weld::Button&, void); - void ObjectHdl(const weld::ComboBoxText*); + void ObjectHdl(const weld::ComboBox*); SfxItemSet* EvalCurrentSelection(void); public: @@ -127,7 +127,7 @@ class SwColumnPage : public SfxTabPage std::unique_ptr<weld::Label> m_xLineHeightLbl; std::unique_ptr<weld::MetricSpinButton> m_xLineHeightEdit; std::unique_ptr<weld::Label> m_xLinePosLbl; - std::unique_ptr<weld::ComboBoxText> m_xLinePosDLB; + std::unique_ptr<weld::ComboBox> m_xLinePosDLB; std::unique_ptr<weld::Label> m_xTextDirectionFT; std::unique_ptr<svx::SvxFrameDirectionListBox> m_xTextDirectionLB; std::unique_ptr<ColorListBox> m_xLineColorDLB; @@ -143,7 +143,7 @@ class SwColumnPage : public SfxTabPage std::unique_ptr<weld::CustomWeld> m_xFrameExampleWN; std::unique_ptr<weld::Label> m_xApplyToFT; - std::unique_ptr<weld::ComboBoxText> m_xApplyToLB; + std::unique_ptr<weld::ComboBox> m_xApplyToLB; // Handler DECL_LINK(ColModify, weld::SpinButton&, void); @@ -156,7 +156,7 @@ class SwColumnPage : public SfxTabPage DECL_LINK(Up, weld::Button&, void); DECL_LINK(Down, weld::Button&, void); DECL_LINK(UpdateColMgr, weld::MetricSpinButton&, void); - DECL_LINK(UpdateColMgrListBox, weld::ComboBoxText&, void); + DECL_LINK(UpdateColMgrListBox, weld::ComboBox&, void); DECL_LINK(UpdateColMgrLineBox, SvtLineListBox&, void); DECL_LINK(UpdateColMgrColorBox, ColorListBox&, void); void Timeout(); @@ -211,7 +211,7 @@ public: } weld::Label* GetApplyLabel() { return m_xApplyToFT.get(); } - weld::ComboBoxText* GetApplyComboBox() { return m_xApplyToLB.get(); } + weld::ComboBox* GetApplyComboBox() { return m_xApplyToLB.get(); } }; #endif diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index d5af58f48cf8..222f67a16991 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -137,7 +137,7 @@ friend class SwDropCapsPict; std::unique_ptr<weld::Label> m_xTextText; std::unique_ptr<weld::Entry> m_xTextEdit; std::unique_ptr<weld::Label> m_xTemplateText; - std::unique_ptr<weld::ComboBoxText> m_xTemplateBox; + std::unique_ptr<weld::ComboBox> m_xTemplateBox; std::unique_ptr<weld::CustomWeld> m_xPict; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; @@ -149,7 +149,7 @@ friend class SwDropCapsPict; DECL_LINK(MetricValueChangedHdl, weld::MetricSpinButton&, void); DECL_LINK(ValueChangedHdl, weld::SpinButton&, void); DECL_LINK(ModifyHdl, weld::Entry&, void); - DECL_LINK(SelectHdl, weld::ComboBoxText&, void); + DECL_LINK(SelectHdl, weld::ComboBox&, void); DECL_LINK(WholeWordHdl, weld::ToggleButton&, void); using SfxTabPage::ActivatePage; diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 22a34fb997fa..0e68dec3dc13 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -94,15 +94,15 @@ class SwEnvPage : public SfxTabPage SwEnvPreview m_aPreview; std::unique_ptr<weld::TextView> m_xAddrEdit; - std::unique_ptr<weld::ComboBoxText> m_xDatabaseLB; - std::unique_ptr<weld::ComboBoxText> m_xTableLB; - std::unique_ptr<weld::ComboBoxText> m_xDBFieldLB; + std::unique_ptr<weld::ComboBox> m_xDatabaseLB; + std::unique_ptr<weld::ComboBox> m_xTableLB; + std::unique_ptr<weld::ComboBox> m_xDBFieldLB; std::unique_ptr<weld::Button> m_xInsertBT; std::unique_ptr<weld::CheckButton> m_xSenderBox; std::unique_ptr<weld::TextView> m_xSenderEdit; std::unique_ptr<weld::CustomWeld> m_xPreview; - DECL_LINK(DatabaseHdl, weld::ComboBoxText&, void); + DECL_LINK(DatabaseHdl, weld::ComboBox&, void); DECL_LINK(FieldHdl, weld::Button&, void); DECL_LINK(SenderHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index 127fb10efb27..9489201624a0 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -34,9 +34,9 @@ private: std::unique_ptr<weld::SpinButton> m_xDivIntervalNF; std::unique_ptr<weld::Widget> m_xDivRowsFT; std::unique_ptr<weld::SpinButton> m_xNumIntervalNF; - std::unique_ptr<weld::ComboBoxText> m_xCharStyleLB; + std::unique_ptr<weld::ComboBox> m_xCharStyleLB; std::unique_ptr<SwNumberingTypeListBox> m_xFormatLB; - std::unique_ptr<weld::ComboBoxText> m_xPosLB; + std::unique_ptr<weld::ComboBox> m_xPosLB; std::unique_ptr<weld::MetricSpinButton> m_xOffsetMF; std::unique_ptr<weld::Entry> m_xDivisorED; std::unique_ptr<weld::CheckButton> m_xCountEmptyLinesCB; diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index f1849b17f2c5..b4aa9f79cdc4 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -64,16 +64,16 @@ class SwNumPositionTabPage : 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; @@ -85,7 +85,7 @@ class SwNumPositionTabPage : public SfxTabPage void InitControls(); DECL_LINK(LevelHdl, weld::TreeView&, void); - DECL_LINK(EditModifyHdl, weld::ComboBoxText&, void); + DECL_LINK(EditModifyHdl, weld::ComboBox&, void); DECL_LINK(DistanceHdl, weld::MetricSpinButton&, void); DECL_LINK(RelativeHdl, weld::ToggleButton&, void); DECL_LINK(StandardHdl, weld::Button&, void); @@ -93,7 +93,7 @@ class SwNumPositionTabPage : 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/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx index ed704e54341d..6ceec6355c2a 100644 --- a/sw/source/uibase/inc/numberingtypelistbox.hxx +++ b/sw/source/uibase/inc/numberingtypelistbox.hxx @@ -43,14 +43,14 @@ struct SwNumberingTypeListBox_Impl; class SW_DLLPUBLIC SwNumberingTypeListBox { - std::unique_ptr<weld::ComboBoxText> m_xWidget; + std::unique_ptr<weld::ComboBox> m_xWidget; std::unique_ptr<SwNumberingTypeListBox_Impl> m_xImpl; public: - SwNumberingTypeListBox(std::unique_ptr<weld::ComboBoxText> pWidget); + SwNumberingTypeListBox(std::unique_ptr<weld::ComboBox> pWidget); ~SwNumberingTypeListBox(); - void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_xWidget->connect_changed(rLink); } + void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xWidget->connect_changed(rLink); } void Reload(SwInsertNumTypes nTypeFlags); SvxNumType GetSelectedNumberingType(); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index f1ba2dc7a5a2..282cf269e00f 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -36,9 +36,9 @@ class SwParagraphNumTabPage final : public SfxTabPage bool bCurNumrule : 1; std::unique_ptr<weld::Widget> m_xOutlineStartBX; - std::unique_ptr<weld::ComboBoxText> m_xOutlineLvLB; + std::unique_ptr<weld::ComboBox> m_xOutlineLvLB; std::unique_ptr<weld::Widget> m_xNumberStyleBX; - std::unique_ptr<weld::ComboBoxText> m_xNumberStyleLB; + std::unique_ptr<weld::ComboBox> m_xNumberStyleLB; std::unique_ptr<weld::Button> m_xEditNumStyleBtn; std::unique_ptr<weld::CheckButton> m_xNewStartCB; @@ -54,10 +54,10 @@ class SwParagraphNumTabPage final : public SfxTabPage std::unique_ptr<weld::SpinButton> m_xRestartNF; DECL_LINK(NewStartHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(StyleHdl_Impl, weld::ComboBoxText&,void); + DECL_LINK(StyleHdl_Impl, weld::ComboBox&,void); DECL_LINK(LineCountHdl_Impl, weld::ToggleButton&, void); DECL_LINK(EditNumStyleHdl_Impl, weld::Button&, void); - DECL_LINK(EditNumStyleSelectHdl_Impl, weld::ComboBoxText&, void); + DECL_LINK(EditNumStyleSelectHdl_Impl, weld::ComboBox&, void); static const sal_uInt16 aPageRg[]; @@ -80,7 +80,7 @@ public: void DisableOutline(); void DisableNumbering(); - weld::ComboBoxText& GetStyleBox() {return *m_xNumberStyleLB;}; + weld::ComboBox& GetStyleBox() {return *m_xNumberStyleLB;}; }; #endif diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 6557d6a010ee..e00b1dc1e79b 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -102,10 +102,10 @@ class SwAddPrinterTabPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xPrintEmptyPagesCB; std::unique_ptr<weld::CheckButton> m_xPaperFromSetupCB; - std::unique_ptr<weld::ComboBoxText> m_xFaxLB; + std::unique_ptr<weld::ComboBox> m_xFaxLB; DECL_LINK(AutoClickHdl, weld::ToggleButton&, void); - DECL_LINK(SelectHdl, weld::ComboBoxText&, void); + DECL_LINK(SelectHdl, weld::ComboBox&, void); public: SwAddPrinterTabPage(TabPageParent pParent, const SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index d009b1d60226..9f5054e66caf 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -87,9 +87,9 @@ class SwOutlineSettingsTabPage : public SfxTabPage NumberingPreview m_aPreviewWIN; std::unique_ptr<weld::TreeView> m_xLevelLB; - std::unique_ptr<weld::ComboBoxText> m_xCollBox; + std::unique_ptr<weld::ComboBox> m_xCollBox; std::unique_ptr<SwNumberingTypeListBox> m_xNumberBox; - std::unique_ptr<weld::ComboBoxText> m_xCharFormatLB; + std::unique_ptr<weld::ComboBox> m_xCharFormatLB; std::unique_ptr<weld::Label> m_xAllLevelFT; std::unique_ptr<weld::SpinButton> m_xAllLevelNF; std::unique_ptr<weld::Entry> m_xPrefixED; @@ -99,12 +99,12 @@ class SwOutlineSettingsTabPage : public SfxTabPage DECL_LINK( LevelHdl, weld::TreeView&, void ); DECL_LINK( ToggleComplete, weld::SpinButton&, void ); - DECL_LINK( CollSelect, weld::ComboBoxText&, void ); + DECL_LINK( CollSelect, weld::ComboBox&, void ); DECL_LINK( CollSelectGetFocus, weld::Widget&, void ); - DECL_LINK( NumberSelect, weld::ComboBoxText&, void ); + DECL_LINK( NumberSelect, weld::ComboBox&, void ); DECL_LINK( DelimModify, weld::Entry&, void ); DECL_LINK( StartModified, weld::SpinButton&, void ); - DECL_LINK( CharFormatHdl, weld::ComboBoxText&, void ); + DECL_LINK( CharFormatHdl, weld::ComboBox&, void ); void Update(); diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 3ed547b17389..6315f996e486 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -52,7 +52,7 @@ private: std::unique_ptr<weld::RadioButton> m_xMaxHeightBtn; std::unique_ptr<weld::MetricSpinButton> m_xMaxHeightEdit; std::unique_ptr<weld::MetricSpinButton> m_xDistEdit; - std::unique_ptr<weld::ComboBoxText> m_xLinePosBox; + std::unique_ptr<weld::ComboBox> m_xLinePosBox; std::unique_ptr<SvtLineListBox> m_xLineTypeBox; std::unique_ptr<weld::MetricSpinButton> m_xLineWidthEdit; std::unique_ptr<ColorListBox> m_xLineColorBox; diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index ed7b877ee226..b15ea2c550a2 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -32,19 +32,19 @@ class SwSortDlg : public weld::GenericDialogController std::unique_ptr<weld::CheckButton> m_xKeyCB1; std::unique_ptr<weld::SpinButton> m_xColEdt1; - std::unique_ptr<weld::ComboBoxText> m_xTypDLB1; + std::unique_ptr<weld::ComboBox> m_xTypDLB1; std::unique_ptr<weld::RadioButton> m_xSortUp1RB; std::unique_ptr<weld::RadioButton> m_xSortDn1RB; std::unique_ptr<weld::CheckButton> m_xKeyCB2; std::unique_ptr<weld::SpinButton> m_xColEdt2; - std::unique_ptr<weld::ComboBoxText> m_xTypDLB2; + std::unique_ptr<weld::ComboBox> m_xTypDLB2; std::unique_ptr<weld::RadioButton> m_xSortUp2RB; std::unique_ptr<weld::RadioButton> m_xSortDn2RB; std::unique_ptr<weld::CheckButton> m_xKeyCB3; std::unique_ptr<weld::SpinButton> m_xColEdt3; - std::unique_ptr<weld::ComboBoxText> m_xTypDLB3; + std::unique_ptr<weld::ComboBox> m_xTypDLB3; std::unique_ptr<weld::RadioButton> m_xSortUp3RB; std::unique_ptr<weld::RadioButton> m_xSortDn3RB; @@ -75,8 +75,8 @@ class SwSortDlg : public weld::GenericDialogController DECL_LINK(CheckHdl, weld::ToggleButton&, void); DECL_LINK(DelimHdl, weld::ToggleButton&, void ); - DECL_LINK(LanguageListBoxHdl, weld::ComboBoxText&, void); - void LanguageHdl(weld::ComboBoxText const*); + DECL_LINK(LanguageListBoxHdl, weld::ComboBox&, void); + void LanguageHdl(weld::ComboBox const*); DECL_LINK(DelimCharHdl, weld::Button&,void); public: diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index 1a05faf25365..d39cf256d85f 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -36,7 +36,7 @@ private: std::unique_ptr<weld::SpinButton> m_xRestartNumberingNF; std::unique_ptr<weld::CheckButton> m_xSetPageNumberCB; std::unique_ptr<weld::SpinButton> m_xSetPageNumberNF; - std::unique_ptr<weld::ComboBoxText> m_xPagePropertiesLB; + std::unique_ptr<weld::ComboBox> m_xPagePropertiesLB; std::unique_ptr<weld::Button> m_xPagePropertiesPB; std::unique_ptr<weld::Button> m_xOkPB; diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx index 54f2268a7cfe..68def8b554bc 100644 --- a/sw/source/uibase/inc/uitool.hxx +++ b/sw/source/uibase/inc/uitool.hxx @@ -31,7 +31,7 @@ class SwPageDesc; class SvxTabStopItem; class SwWrtShell; class ListBox; -namespace weld { class ComboBoxText; } +namespace weld { class ComboBox; } class SwDocShell; class SwFrameFormat; class SwTabCols; @@ -87,11 +87,11 @@ void SetApplyCharUnit(bool bApplyChar, bool bWeb); // fill ListBox with all char style templates, except the standard ones SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted = false, bool bWithDefault = false); -SW_DLLPUBLIC void FillCharStyleListBox(weld::ComboBoxText& rToFill, SwDocShell* pDocSh, bool bSorted = false, bool bWithDefault = false); +SW_DLLPUBLIC void FillCharStyleListBox(weld::ComboBox& rToFill, SwDocShell* pDocSh, bool bSorted = false, bool bWithDefault = false); //inserts a string sorted into a ListBox, SW_DLLPUBLIC sal_Int32 InsertStringSorted(const OUString& rEntry, ListBox& rToFill, sal_Int32 nOffset); -SW_DLLPUBLIC void InsertStringSorted(const OUString& rId, const OUString& rEntry, weld::ComboBoxText& rToFill, int nOffset); +SW_DLLPUBLIC void InsertStringSorted(const OUString& rId, const OUString& rEntry, weld::ComboBox& rToFill, int nOffset); // Get table width and alignment SwTwips GetTableWidth( SwFrameFormat const * pFormat, SwTabCols const & rCols, sal_uInt16 *pPercent, diff --git a/sw/source/uibase/inc/watermarkdialog.hxx b/sw/source/uibase/inc/watermarkdialog.hxx index 68f7d3d40a5f..65801fcba3a9 100644 --- a/sw/source/uibase/inc/watermarkdialog.hxx +++ b/sw/source/uibase/inc/watermarkdialog.hxx @@ -28,7 +28,7 @@ private: std::unique_ptr<weld::Entry> m_xTextInput; std::unique_ptr<weld::Button> m_xOKButton; - std::unique_ptr<weld::ComboBoxText> m_xFont; + std::unique_ptr<weld::ComboBox> m_xFont; std::unique_ptr<weld::MetricSpinButton> m_xAngle; std::unique_ptr<weld::MetricSpinButton> m_xTransparency; std::unique_ptr<ColorListBox> m_xColor; diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 71f186d948b6..f66f6a466b94 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -38,7 +38,7 @@ struct SwNumberingTypeListBox_Impl uno::Reference<text::XNumberingTypeInfo> xInfo; }; -SwNumberingTypeListBox::SwNumberingTypeListBox(std::unique_ptr<weld::ComboBoxText> pWidget) +SwNumberingTypeListBox::SwNumberingTypeListBox(std::unique_ptr<weld::ComboBox> pWidget) : m_xWidget(std::move(pWidget)) , m_xImpl(new SwNumberingTypeListBox_Impl) { diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index dc4e4abda802..02f9d57ba758 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -152,7 +152,7 @@ class SwTextFlowPage : public SfxTabPage std::unique_ptr<weld::RadioButton> m_xPgBrkBeforeRB; std::unique_ptr<weld::RadioButton> m_xPgBrkAfterRB; std::unique_ptr<weld::CheckButton> m_xPageCollCB; - std::unique_ptr<weld::ComboBoxText> m_xPageCollLB; + std::unique_ptr<weld::ComboBox> m_xPageCollLB; std::unique_ptr<weld::CheckButton> m_xPageNoCB; std::unique_ptr<weld::SpinButton> m_xPageNoNF; std::unique_ptr<weld::CheckButton> m_xSplitCB; @@ -161,8 +161,8 @@ class SwTextFlowPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xHeadLineCB; std::unique_ptr<weld::Widget> m_xRepeatHeaderCombo; std::unique_ptr<weld::SpinButton> m_xRepeatHeaderNF; - std::unique_ptr<weld::ComboBoxText> m_xTextDirectionLB; - std::unique_ptr<weld::ComboBoxText> m_xVertOrientLB; + std::unique_ptr<weld::ComboBox> m_xTextDirectionLB; + std::unique_ptr<weld::ComboBox> m_xVertOrientLB; DECL_LINK(PageBreakHdl_Impl, weld::ToggleButton&, void); DECL_LINK(ApplyCollClickHdl_Impl, weld::ToggleButton&, void); diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index 09bb27b81c9a..de1621023946 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -677,7 +677,7 @@ sal_Int32 InsertStringSorted(const OUString& rEntry, ListBox& rToFill, sal_Int32 return rToFill.InsertEntry(rEntry, nOffset); } -void InsertStringSorted(const OUString& rId, const OUString& rEntry, weld::ComboBoxText& rToFill, int nOffset) +void InsertStringSorted(const OUString& rId, const OUString& rEntry, weld::ComboBox& rToFill, int nOffset) { CollatorWrapper& rCaseColl = ::GetAppCaseCollator(); const int nCount = rToFill.get_count(); @@ -729,7 +729,7 @@ void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted, bo } }; -void FillCharStyleListBox(weld::ComboBoxText& rToFill, SwDocShell* pDocSh, bool bSorted, bool bWithDefault) +void FillCharStyleListBox(weld::ComboBox& rToFill, SwDocShell* pDocSh, bool bSorted, bool bWithDefault) { const int nOffset = rToFill.get_count() > 0 ? 1 : 0; SfxStyleSheetBasePool* pPool = pDocSh->GetStyleSheetPool(); diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index c3286ff365fb..0b6fb19bed87 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -2094,21 +2094,21 @@ IMPL_LINK(SalInstanceDrawingArea, QueryTooltipHdl, tools::Rectangle&, rHelpArea, //ComboBox and ListBox have similar apis, ComboBoxes in LibreOffice have an edit box and ListBoxes //don't. This distinction isn't there in Gtk. Use a template to sort this problem out. template <class vcl_type> -class SalInstanceComboBoxText : public SalInstanceContainer, public virtual weld::ComboBoxText +class SalInstanceComboBox : public SalInstanceContainer, public virtual weld::ComboBox { protected: - VclPtr<vcl_type> m_xComboBoxText; + VclPtr<vcl_type> m_xComboBox; public: - SalInstanceComboBoxText(vcl_type* pComboBoxText, bool bTakeOwnership) - : SalInstanceContainer(pComboBoxText, bTakeOwnership) - , m_xComboBoxText(pComboBoxText) + SalInstanceComboBox(vcl_type* pComboBox, bool bTakeOwnership) + : SalInstanceContainer(pComboBox, bTakeOwnership) + , m_xComboBox(pComboBox) { } virtual int get_active() const override { - const sal_Int32 nRet = m_xComboBoxText->GetSelectedEntryPos(); + const sal_Int32 nRet = m_xComboBox->GetSelectedEntryPos(); if (nRet == LISTBOX_ENTRY_NOTFOUND) return -1; return nRet; @@ -2116,12 +2116,12 @@ public: const OUString* getEntryData(int index) const { - return static_cast<const OUString*>(m_xComboBoxText->GetEntryData(index)); + return static_cast<const OUString*>(m_xComboBox->GetEntryData(index)); } virtual OUString get_active_id() const override { - const OUString* pRet = getEntryData(m_xComboBoxText->GetSelectedEntryPos()); + const OUString* pRet = getEntryData(m_xComboBox->GetSelectedEntryPos()); if (!pRet) return OUString(); return *pRet; @@ -2135,7 +2135,7 @@ public: if (!pId) continue; if (*pId == rStr) - m_xComboBoxText->SelectEntryPos(i); + m_xComboBox->SelectEntryPos(i); } } @@ -2143,15 +2143,15 @@ public: { if (pos == -1) { - m_xComboBoxText->SetNoSelection(); + m_xComboBox->SetNoSelection(); return; } - m_xComboBoxText->SelectEntryPos(pos); + m_xComboBox->SelectEntryPos(pos); } virtual OUString get_text(int pos) const override { - return m_xComboBoxText->GetEntry(pos); + return m_xComboBox->GetEntry(pos); } virtual OUString get_id(int pos) const override @@ -2164,17 +2164,17 @@ public: virtual void insert_text(int pos, const OUString& rStr) override { - m_xComboBoxText->InsertEntry(rStr, pos == -1 ? COMBOBOX_APPEND : pos); + m_xComboBox->InsertEntry(rStr, pos == -1 ? COMBOBOX_APPEND : pos); } virtual int get_count() const override { - return m_xComboBoxText->GetEntryCount(); + return m_xComboBox->GetEntryCount(); } virtual int find_text(const OUString& rStr) const override { - const sal_Int32 nRet = m_xComboBoxText->GetEntryPos(rStr); + const sal_Int32 nRet = m_xComboBox->GetEntryPos(rStr); if (nRet == LISTBOX_ENTRY_NOTFOUND) return -1; return nRet; @@ -2200,40 +2200,40 @@ public: const OUString* pId = getEntryData(i); delete pId; } - return m_xComboBoxText->Clear(); + return m_xComboBox->Clear(); } virtual void make_sorted() override { - m_xComboBoxText->SetStyle(m_xComboBoxText->GetStyle() | WB_SORT); + m_xComboBox->SetStyle(m_xComboBox->GetStyle() | WB_SORT); } - virtual ~SalInstanceComboBoxText() override + virtual ~SalInstanceComboBox() override { clear(); } }; -class SalInstanceComboBoxTextWithoutEdit : public SalInstanceComboBoxText<ListBox> +class SalInstanceComboBoxWithoutEdit : public SalInstanceComboBox<ListBox> { private: DECL_LINK(SelectHdl, ListBox&, void); public: - SalInstanceComboBoxTextWithoutEdit(ListBox* pListBox, bool bTakeOwnership) - : SalInstanceComboBoxText<ListBox>(pListBox, bTakeOwnership) + SalInstanceComboBoxWithoutEdit(ListBox* pListBox, bool bTakeOwnership) + : SalInstanceComboBox<ListBox>(pListBox, bTakeOwnership) { - m_xComboBoxText->SetSelectHdl(LINK(this, SalInstanceComboBoxTextWithoutEdit, SelectHdl)); + m_xComboBox->SetSelectHdl(LINK(this, SalInstanceComboBoxWithoutEdit, SelectHdl)); } virtual OUString get_active_text() const override { - return m_xComboBoxText->GetSelectedEntry(); + return m_xComboBox->GetSelectedEntry(); } virtual void remove(int pos) override { - m_xComboBoxText->RemoveEntry(pos); + m_xComboBox->RemoveEntry(pos); } virtual void insert(int pos, const OUString& rId, const OUString& rStr, const OUString* pImage) override @@ -2241,10 +2241,10 @@ public: auto nInsertPos = pos == -1 ? COMBOBOX_APPEND : pos; sal_Int32 nInsertedAt; if (!pImage) - nInsertedAt = m_xComboBoxText->InsertEntry(rStr, nInsertPos); + nInsertedAt = m_xComboBox->InsertEntry(rStr, nInsertPos); else - nInsertedAt = m_xComboBoxText->InsertEntry(rStr, createImage(*pImage), nInsertPos); - m_xComboBoxText->SetEntryData(nInsertedAt, new OUString(rId)); + nInsertedAt = m_xComboBox->InsertEntry(rStr, createImage(*pImage), nInsertPos); + m_xComboBox->SetEntryData(nInsertedAt, new OUString(rId)); } virtual bool has_entry() const override @@ -2283,28 +2283,28 @@ public: assert(false); } - virtual ~SalInstanceComboBoxTextWithoutEdit() override + virtual ~SalInstanceComboBoxWithoutEdit() override { - m_xComboBoxText->SetSelectHdl(Link<ListBox&, void>()); + m_xComboBox->SetSelectHdl(Link<ListBox&, void>()); } }; -IMPL_LINK_NOARG(SalInstanceComboBoxTextWithoutEdit, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SalInstanceComboBoxWithoutEdit, SelectHdl, ListBox&, void) { return signal_changed(); } -class SalInstanceComboBoxTextWithEdit : public SalInstanceComboBoxText<ComboBox> +class SalInstanceComboBoxWithEdit : public SalInstanceComboBox<ComboBox> { private: DECL_LINK(ChangeHdl, Edit&, void); DECL_LINK(EntryActivateHdl, Edit&, void); public: - SalInstanceComboBoxTextWithEdit(ComboBox* pComboBoxText, bool bTakeOwnership) - : SalInstanceComboBoxText<ComboBox>(pComboBoxText, bTakeOwnership) + SalInstanceComboBoxWithEdit(::ComboBox* pComboBox, bool bTakeOwnership) + : SalInstanceComboBox<::ComboBox>(pComboBox, bTakeOwnership) { - m_xComboBoxText->SetModifyHdl(LINK(this, SalInstanceComboBoxTextWithEdit, ChangeHdl)); - m_xComboBoxText->SetEntryActivateHdl(LINK(this, SalInstanceComboBoxTextWithEdit, EntryActivateHdl)); + m_xComboBox->SetModifyHdl(LINK(this, SalInstanceComboBoxWithEdit, ChangeHdl)); + m_xComboBox->SetEntryActivateHdl(LINK(this, SalInstanceComboBoxWithEdit, EntryActivateHdl)); } virtual bool has_entry() const override @@ -2315,19 +2315,19 @@ public: virtual void set_entry_error(bool bError) override { if (bError) - m_xComboBoxText->SetControlForeground(Color(0xf0, 0, 0)); + m_xComboBox->SetControlForeground(Color(0xf0, 0, 0)); else - m_xComboBoxText->SetControlForeground(); + m_xComboBox->SetControlForeground(); } virtual OUString get_active_text() const override { - return m_xComboBoxText->GetText(); + return m_xComboBox->GetText(); } virtual void remove(int pos) override { - m_xComboBoxText->RemoveEntryAt(pos); + m_xComboBox->RemoveEntryAt(pos); } virtual void insert(int pos, const OUString& rId, const OUString& rStr, const OUString* pImage) override @@ -2335,53 +2335,53 @@ public: auto nInsertPos = pos == -1 ? COMBOBOX_APPEND : pos; sal_Int32 nInsertedAt; if (!pImage) - nInsertedAt = m_xComboBoxText->InsertEntry(rStr, nInsertPos); + nInsertedAt = m_xComboBox->InsertEntry(rStr, nInsertPos); else - nInsertedAt = m_xComboBoxText->InsertEntryWithImage(rStr, createImage(*pImage), nInsertPos); - m_xComboBoxText->SetEntryData(nInsertedAt, new OUString(rId)); + nInsertedAt = m_xComboBox->InsertEntryWithImage(rStr, createImage(*pImage), nInsertPos); + m_xComboBox->SetEntryData(nInsertedAt, new OUString(rId)); } virtual void set_entry_text(const OUString& rText) override { - m_xComboBoxText->SetText(rText); + m_xComboBox->SetText(rText); } virtual void set_entry_width_chars(int nChars) override { - m_xComboBoxText->SetWidthInChars(nChars); + m_xComboBox->SetWidthInChars(nChars); } virtual void set_entry_completion(bool bEnable) override { - m_xComboBoxText->EnableAutocomplete(bEnable); + m_xComboBox->EnableAutocomplete(bEnable); } virtual void select_entry_region(int nStartPos, int nEndPos) override { - m_xComboBoxText->SetSelection(Selection(nStartPos, nEndPos < 0 ? SELECTION_MAX : nEndPos)); + m_xComboBox->SetSelection(Selection(nStartPos, nEndPos < 0 ? SELECTION_MAX : nEndPos)); } virtual bool get_entry_selection_bounds(int& rStartPos, int& rEndPos) override { - const Selection& rSelection = m_xComboBoxText->GetSelection(); + const Selection& rSelection = m_xComboBox->GetSelection(); rStartPos = rSelection.Min(); rEndPos = rSelection.Max(); return rSelection.Len(); } - virtual ~SalInstanceComboBoxTextWithEdit() override + virtual ~SalInstanceComboBoxWithEdit() override { - m_xComboBoxText->SetEntryActivateHdl(Link<Edit&, void>()); - m_xComboBoxText->SetModifyHdl(Link<Edit&, void>()); + m_xComboBox->SetEntryActivateHdl(Link<Edit&, void>()); + m_xComboBox->SetModifyHdl(Link<Edit&, void>()); } }; -IMPL_LINK_NOARG(SalInstanceComboBoxTextWithEdit, ChangeHdl, Edit&, void) +IMPL_LINK_NOARG(SalInstanceComboBoxWithEdit, ChangeHdl, Edit&, void) { signal_changed(); } -IMPL_LINK_NOARG(SalInstanceComboBoxTextWithEdit, EntryActivateHdl, Edit&, void) +IMPL_LINK_NOARG(SalInstanceComboBoxWithEdit, EntryActivateHdl, Edit&, void) { m_aEntryActivateHdl.Call(*this); } @@ -2617,14 +2617,14 @@ public: return pRet; } - virtual std::unique_ptr<weld::ComboBoxText> weld_combo_box_text(const OString &id, bool bTakeOwnership) override + virtual std::unique_ptr<weld::ComboBox> weld_combo_box(const OString &id, bool bTakeOwnership) override { - vcl::Window* pComboBoxText = m_xBuilder->get<vcl::Window>(id); - ComboBox* pComboBox = dynamic_cast<ComboBox*>(pComboBoxText); + vcl::Window* pWidget = m_xBuilder->get<vcl::Window>(id); + ::ComboBox* pComboBox = dynamic_cast<::ComboBox*>(pWidget); if (pComboBox) - return o3tl::make_unique<SalInstanceComboBoxTextWithEdit>(pComboBox, bTakeOwnership); - ListBox* pListBox = dynamic_cast<ListBox*>(pComboBoxText); - return pListBox ? o3tl::make_unique<SalInstanceComboBoxTextWithoutEdit>(pListBox, bTakeOwnership) : nullptr; + return o3tl::make_unique<SalInstanceComboBoxWithEdit>(pComboBox, bTakeOwnership); + ListBox* pListBox = dynamic_cast<ListBox*>(pWidget); + return pListBox ? o3tl::make_unique<SalInstanceComboBoxWithoutEdit>(pListBox, bTakeOwnership) : nullptr; } virtual std::unique_ptr<weld::EntryTreeView> weld_entry_tree_view(const OString& containerid, const OString& entryid, const OString& treeviewid, bool bTakeOwnership) override diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 36d397c03fd7..2a75f3051768 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -27,7 +27,7 @@ using namespace psp; -void RTSDialog::insertAllPPDValues(weld::ComboBoxText& rBox, const PPDParser* pParser, const PPDKey* pKey ) +void RTSDialog::insertAllPPDValues(weld::ComboBox& rBox, const PPDParser* pParser, const PPDKey* pKey ) { if( ! pKey || ! pParser ) return; @@ -139,13 +139,13 @@ RTSPaperPage::RTSPaperPage(weld::Widget* pPage, RTSDialog* pDialog) , m_xContainer(m_xBuilder->weld_widget("PrinterPaperPage")) , m_xCbFromSetup(m_xBuilder->weld_check_button("papersizefromsetup")) , m_xPaperText(m_xBuilder->weld_label("paperft")) - , m_xPaperBox(m_xBuilder->weld_combo_box_text("paperlb")) + , m_xPaperBox(m_xBuilder->weld_combo_box("paperlb")) , m_xOrientText(m_xBuilder->weld_label("orientft")) - , m_xOrientBox(m_xBuilder->weld_combo_box_text("orientlb")) + , m_xOrientBox(m_xBuilder->weld_combo_box("orientlb")) , m_xDuplexText(m_xBuilder->weld_label("duplexft")) - , m_xDuplexBox(m_xBuilder->weld_combo_box_text("duplexlb")) + , m_xDuplexBox(m_xBuilder->weld_combo_box("duplexlb")) , m_xSlotText(m_xBuilder->weld_label("slotft")) - , m_xSlotBox(m_xBuilder->weld_combo_box_text("slotlb")) + , m_xSlotBox(m_xBuilder->weld_combo_box("slotlb")) { //PrinterPaperPage m_xPaperBox->connect_changed( LINK( this, RTSPaperPage, SelectHdl ) ); @@ -230,7 +230,7 @@ void RTSPaperPage::update() } } -IMPL_LINK( RTSPaperPage, SelectHdl, weld::ComboBoxText&, rBox, void ) +IMPL_LINK( RTSPaperPage, SelectHdl, weld::ComboBox&, rBox, void ) { const PPDKey* pKey = nullptr; if( &rBox == m_xPaperBox.get() ) @@ -284,9 +284,9 @@ RTSDevicePage::RTSDevicePage(weld::Widget* pPage, RTSDialog* pParent) , m_xPPDKeyBox(m_xBuilder->weld_tree_view("options")) , m_xPPDValueBox(m_xBuilder->weld_tree_view("values")) , m_xCustomEdit(m_xBuilder->weld_entry("custom")) - , m_xLevelBox(m_xBuilder->weld_combo_box_text("level")) - , m_xSpaceBox(m_xBuilder->weld_combo_box_text("colorspace")) - , m_xDepthBox(m_xBuilder->weld_combo_box_text("colordepth")) + , m_xLevelBox(m_xBuilder->weld_combo_box("level")) + , m_xSpaceBox(m_xBuilder->weld_combo_box("colorspace")) + , m_xDepthBox(m_xBuilder->weld_combo_box("colordepth")) { m_aReselectCustomIdle.SetInvokeHandler(LINK(this, RTSDevicePage, ImplHandleReselectHdl)); m_aReselectCustomIdle.SetDebugName("RTSDevicePage m_aReselectCustomIdle"); diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index 0685f80aa2b9..67eabe92a6a6 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -52,7 +52,7 @@ class RTSDialog : public weld::GenericDialogController DECL_LINK(ClickButton, weld::Button&, void ); // helper functions - void insertAllPPDValues(weld::ComboBoxText&, const psp::PPDParser*, const psp::PPDKey*); + void insertAllPPDValues(weld::ComboBox&, const psp::PPDParser*, const psp::PPDKey*); public: RTSDialog(const ::psp::PrinterInfo& rJobData, weld::Window* pParent); virtual ~RTSDialog() override; @@ -75,18 +75,18 @@ private: std::unique_ptr<weld::CheckButton> m_xCbFromSetup; std::unique_ptr<weld::Label> m_xPaperText; - std::unique_ptr<weld::ComboBoxText> m_xPaperBox; + std::unique_ptr<weld::ComboBox> m_xPaperBox; std::unique_ptr<weld::Label> m_xOrientText; - std::unique_ptr<weld::ComboBoxText> m_xOrientBox; + std::unique_ptr<weld::ComboBox> m_xOrientBox; std::unique_ptr<weld::Label> m_xDuplexText; - std::unique_ptr<weld::ComboBoxText> m_xDuplexBox; + std::unique_ptr<weld::ComboBox> m_xDuplexBox; std::unique_ptr<weld::Label> m_xSlotText; - std::unique_ptr<weld::ComboBoxText> m_xSlotBox; + std::unique_ptr<weld::ComboBox> m_xSlotBox; - DECL_LINK(SelectHdl, weld::ComboBoxText&, void); + DECL_LINK(SelectHdl, weld::ComboBox&, void); DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); public: RTSPaperPage(weld::Widget* pPage, RTSDialog* pDialog); @@ -110,9 +110,9 @@ private: std::unique_ptr<weld::TreeView> m_xPPDValueBox; std::unique_ptr<weld::Entry> m_xCustomEdit; - std::unique_ptr<weld::ComboBoxText> m_xLevelBox; - std::unique_ptr<weld::ComboBoxText> m_xSpaceBox; - std::unique_ptr<weld::ComboBoxText> m_xDepthBox; + std::unique_ptr<weld::ComboBox> m_xLevelBox; + std::unique_ptr<weld::ComboBox> m_xSpaceBox; + std::unique_ptr<weld::ComboBox> m_xDepthBox; void FillValueBox( const ::psp::PPDKey* ); void ValueBoxChanged( const ::psp::PPDKey* ); diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 61c4337e4c0a..93f23b2b0e8e 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -4553,10 +4553,10 @@ namespace } } -class GtkInstanceComboBoxText : public GtkInstanceContainer, public virtual weld::ComboBoxText +class GtkInstanceComboBox : public GtkInstanceContainer, public virtual weld::ComboBox { private: - GtkComboBox* m_pComboBoxText; + GtkComboBox* m_pComboBox; std::unique_ptr<comphelper::string::NaturalStringSorter> m_xSorter; gboolean m_bPopupActive; gulong m_nChangedSignalId; @@ -4565,21 +4565,21 @@ private: static void signalChanged(GtkComboBox*, gpointer widget) { - GtkInstanceComboBoxText* pThis = static_cast<GtkInstanceComboBoxText*>(widget); + GtkInstanceComboBox* pThis = static_cast<GtkInstanceComboBox*>(widget); SolarMutexGuard aGuard; pThis->signal_changed(); } static void signalPopupShown(GtkComboBox*, GParamSpec*, gpointer widget) { - GtkInstanceComboBoxText* pThis = static_cast<GtkInstanceComboBoxText*>(widget); + GtkInstanceComboBox* pThis = static_cast<GtkInstanceComboBox*>(widget); pThis->signal_popup_shown(); } void signal_popup_shown() { gboolean bIsShown(false); - g_object_get(m_pComboBoxText, "popup-shown", &bIsShown, nullptr); + g_object_get(m_pComboBox, "popup-shown", &bIsShown, nullptr); if (m_bPopupActive != bIsShown) { m_bPopupActive = bIsShown; @@ -4591,7 +4591,7 @@ private: static void signalEntryActivate(GtkComboBox*, gpointer widget) { - GtkInstanceComboBoxText* pThis = static_cast<GtkInstanceComboBoxText*>(widget); + GtkInstanceComboBox* pThis = static_cast<GtkInstanceComboBox*>(widget); pThis->signal_entry_activate(); } @@ -4608,7 +4608,7 @@ private: OUString get(int pos, int col) const { OUString sRet; - GtkTreeModel *pModel = gtk_combo_box_get_model(m_pComboBoxText); + GtkTreeModel *pModel = gtk_combo_box_get_model(m_pComboBox); GtkTreeIter iter; if (gtk_tree_model_iter_nth_child(pModel, &iter, nullptr, pos)) { @@ -4622,7 +4622,7 @@ private: int find(const OUString& rStr, int col) const { - GtkTreeModel *pModel = gtk_combo_box_get_model(m_pComboBoxText); + GtkTreeModel *pModel = gtk_combo_box_get_model(m_pComboBox); GtkTreeIter iter; if (!gtk_tree_model_get_iter_first(pModel, &iter)) return -1; @@ -4645,7 +4645,7 @@ private: GtkEntry* get_entry() { - GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBoxText)); + GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBox)); if (!GTK_IS_ENTRY(pChild)) return nullptr; return GTK_ENTRY(pChild); @@ -4656,7 +4656,7 @@ private: if (gtk_entry_get_completion(pEntry)) return; GtkEntryCompletion* pCompletion = gtk_entry_completion_new(); - gtk_entry_completion_set_model(pCompletion, gtk_combo_box_get_model(m_pComboBoxText)); + gtk_entry_completion_set_model(pCompletion, gtk_combo_box_get_model(m_pComboBox)); gtk_entry_completion_set_text_column(pCompletion, 0); gtk_entry_completion_set_inline_selection(pCompletion, true); gtk_entry_completion_set_inline_completion(pCompletion, true); @@ -4666,26 +4666,26 @@ private: } public: - GtkInstanceComboBoxText(GtkComboBox* pComboBoxText, bool bTakeOwnership) - : GtkInstanceContainer(GTK_CONTAINER(pComboBoxText), bTakeOwnership) - , m_pComboBoxText(pComboBoxText) + GtkInstanceComboBox(GtkComboBox* pComboBox, bool bTakeOwnership) + : GtkInstanceContainer(GTK_CONTAINER(pComboBox), bTakeOwnership) + , m_pComboBox(pComboBox) , m_bPopupActive(false) - , m_nChangedSignalId(g_signal_connect(m_pComboBoxText, "changed", G_CALLBACK(signalChanged), this)) - , m_nPopupShownSignalId(g_signal_connect(m_pComboBoxText, "notify::popup-shown", G_CALLBACK(signalPopupShown), this)) + , m_nChangedSignalId(g_signal_connect(m_pComboBox, "changed", G_CALLBACK(signalChanged), this)) + , m_nPopupShownSignalId(g_signal_connect(m_pComboBox, "notify::popup-shown", G_CALLBACK(signalPopupShown), this)) { if (!has_entry()) { //Always use the same text column renderer layout GtkCellRenderer* text_renderer = gtk_cell_renderer_text_new(); - gtk_cell_layout_pack_end(GTK_CELL_LAYOUT(m_pComboBoxText), text_renderer, true); - gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(m_pComboBoxText), text_renderer, "text", 0, nullptr); + gtk_cell_layout_pack_end(GTK_CELL_LAYOUT(m_pComboBox), text_renderer, true); + gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(m_pComboBox), text_renderer, "text", 0, nullptr); g_object_set(G_OBJECT(text_renderer), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, nullptr); } else { // this bit isn't great, I really want to be able to ellipse the text in the comboboxtext itself and let // the popup menu render them in full, in the interim allow the text to wrap in both cases - GList* cells = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(m_pComboBoxText)); + GList* cells = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(m_pComboBox)); GtkCellRenderer* cell = static_cast<GtkCellRenderer*>(cells->data); g_object_set(G_OBJECT(cell), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, nullptr); if (g_list_length(cells) == 2) @@ -4693,7 +4693,7 @@ public: //The ComboBox is always going to show the column associated with //the entry when there is one, left to its own devices this image //column will be after it, but we want it before - gtk_cell_layout_reorder(GTK_CELL_LAYOUT(m_pComboBoxText), cell, 1); + gtk_cell_layout_reorder(GTK_CELL_LAYOUT(m_pComboBox), cell, 1); } g_list_free(cells); } @@ -4709,12 +4709,12 @@ public: virtual int get_active() const override { - return gtk_combo_box_get_active(m_pComboBoxText); + return gtk_combo_box_get_active(m_pComboBox); } virtual OUString get_active_id() const override { - const gchar* pText = gtk_combo_box_get_active_id(m_pComboBoxText); + const gchar* pText = gtk_combo_box_get_active_id(m_pComboBox); return OUString(pText, pText ? strlen(pText) : 0, RTL_TEXTENCODING_UTF8); } @@ -4722,14 +4722,14 @@ public: { disable_notify_events(); OString aId(OUStringToOString(rStr, RTL_TEXTENCODING_UTF8)); - gtk_combo_box_set_active_id(m_pComboBoxText, aId.getStr()); + gtk_combo_box_set_active_id(m_pComboBox, aId.getStr()); enable_notify_events(); } virtual void set_size_request(int nWidth, int nHeight) override { // tweak the cell render to get a narrower size to stick - GList* cells = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(m_pComboBoxText)); + GList* cells = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(m_pComboBox)); GtkCellRenderer* cell = static_cast<GtkCellRenderer*>(cells->data); GtkRequisition size; gtk_cell_renderer_get_preferred_size(cell, m_pWidget, &size, nullptr); @@ -4742,25 +4742,25 @@ public: virtual void set_active(int pos) override { disable_notify_events(); - gtk_combo_box_set_active(m_pComboBoxText, pos); + gtk_combo_box_set_active(m_pComboBox, pos); enable_notify_events(); } virtual OUString get_active_text() const override { - if (gtk_combo_box_get_has_entry(m_pComboBoxText)) + if (gtk_combo_box_get_has_entry(m_pComboBox)) { - GtkWidget *pEntry = gtk_bin_get_child(GTK_BIN(m_pComboBoxText)); + GtkWidget *pEntry = gtk_bin_get_child(GTK_BIN(m_pComboBox)); const gchar* pText = gtk_entry_get_text(GTK_ENTRY(pEntry)); return OUString(pText, pText ? strlen(pText) : 0, RTL_TEXTENCODING_UTF8); } GtkTreeIter iter; - if (!gtk_combo_box_get_active_iter(m_pComboBoxText, &iter)) + if (!gtk_combo_box_get_active_iter(m_pComboBox, &iter)) return OUString(); - GtkTreeModel *pModel = gtk_combo_box_get_model(m_pComboBoxText); - gint col = gtk_combo_box_get_entry_text_column(m_pComboBoxText); + GtkTreeModel *pModel = gtk_combo_box_get_model(m_pComboBox); + gint col = gtk_combo_box_get_entry_text_column(m_pComboBox); gchar* pStr = nullptr; gtk_tree_model_get(pModel, &iter, col, &pStr, -1); OUString sRet(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8); @@ -4776,7 +4776,7 @@ public: virtual OUString get_id(int pos) const override { - gint id_column = gtk_combo_box_get_id_column(m_pComboBoxText); + gint id_column = gtk_combo_box_get_id_column(m_pComboBox); return get(pos, id_column); } @@ -4784,7 +4784,7 @@ public: { disable_notify_events(); GtkTreeIter iter; - GtkListStore* pListStore = GTK_LIST_STORE(gtk_combo_box_get_model(m_pComboBoxText)); + GtkListStore* pListStore = GTK_LIST_STORE(gtk_combo_box_get_model(m_pComboBox)); gtk_list_store_insert(pListStore, &iter, pos); gtk_list_store_set(pListStore, &iter, 0, OUStringToOString(rText, RTL_TEXTENCODING_UTF8).getStr(), -1); enable_notify_events(); @@ -4794,7 +4794,7 @@ public: { disable_notify_events(); GtkTreeIter iter; - GtkListStore* pListStore = GTK_LIST_STORE(gtk_combo_box_get_model(m_pComboBoxText)); + GtkListStore* pListStore = GTK_LIST_STORE(gtk_combo_box_get_model(m_pComboBox)); gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(pListStore), &iter, nullptr, pos); gtk_list_store_remove(pListStore, &iter); enable_notify_events(); @@ -4803,13 +4803,13 @@ public: virtual void insert(int pos, const OUString& rId, const OUString& rText, const OUString* pImage) override { disable_notify_events(); - insert_row(GTK_LIST_STORE(gtk_combo_box_get_model(m_pComboBoxText)), pos, rId, rText, pImage); + insert_row(GTK_LIST_STORE(gtk_combo_box_get_model(m_pComboBox)), pos, rId, rText, pImage); enable_notify_events(); } virtual int get_count() const override { - GtkTreeModel *pModel = gtk_combo_box_get_model(m_pComboBoxText); + GtkTreeModel *pModel = gtk_combo_box_get_model(m_pComboBox); return gtk_tree_model_iter_n_children(pModel, nullptr); } @@ -4826,7 +4826,7 @@ public: virtual void clear() override { disable_notify_events(); - GtkTreeModel *pModel = gtk_combo_box_get_model(m_pComboBoxText); + GtkTreeModel *pModel = gtk_combo_box_get_model(m_pComboBox); gtk_list_store_clear(GTK_LIST_STORE(pModel)); enable_notify_events(); } @@ -4836,7 +4836,7 @@ public: m_xSorter.reset(new comphelper::string::NaturalStringSorter( ::comphelper::getProcessComponentContext(), Application::GetSettings().GetUILanguageTag().getLocale())); - GtkTreeModel* pModel = gtk_combo_box_get_model(m_pComboBoxText); + GtkTreeModel* pModel = gtk_combo_box_get_model(m_pComboBox); GtkTreeSortable* pSortable = GTK_TREE_SORTABLE(pModel); gtk_tree_sortable_set_sort_func(pSortable, 0, sort_func, m_xSorter.get(), nullptr); gtk_tree_sortable_set_sort_column_id(pSortable, 0, GTK_SORT_ASCENDING); @@ -4844,12 +4844,12 @@ public: virtual bool has_entry() const override { - return gtk_combo_box_get_has_entry(m_pComboBoxText); + return gtk_combo_box_get_has_entry(m_pComboBox); } virtual void set_entry_error(bool bError) override { - GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBoxText)); + GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBox)); assert(GTK_IS_ENTRY(pChild)); GtkEntry* pEntry = GTK_ENTRY(pChild); if (bError) @@ -4860,7 +4860,7 @@ public: virtual void set_entry_text(const OUString& rText) override { - GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBoxText)); + GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBox)); assert(pChild && GTK_IS_ENTRY(pChild)); GtkEntry* pEntry = GTK_ENTRY(pChild); disable_notify_events(); @@ -4870,7 +4870,7 @@ public: virtual void set_entry_width_chars(int nChars) override { - GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBoxText)); + GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBox)); assert(pChild && GTK_IS_ENTRY(pChild)); GtkEntry* pEntry = GTK_ENTRY(pChild); gtk_entry_set_width_chars(pEntry, nChars); @@ -4878,7 +4878,7 @@ public: virtual void select_entry_region(int nStartPos, int nEndPos) override { - GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBoxText)); + GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBox)); assert(pChild && GTK_IS_ENTRY(pChild)); GtkEntry* pEntry = GTK_ENTRY(pChild); disable_notify_events(); @@ -4888,7 +4888,7 @@ public: virtual bool get_entry_selection_bounds(int& rStartPos, int &rEndPos) override { - GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBoxText)); + GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBox)); assert(pChild && GTK_IS_ENTRY(pChild)); GtkEntry* pEntry = GTK_ENTRY(pChild); return gtk_editable_get_selection_bounds(GTK_EDITABLE(pEntry), &rStartPos, &rEndPos); @@ -4908,16 +4908,16 @@ public: { if (GtkEntry* pEntry = get_entry()) g_signal_handler_block(pEntry, m_nEntryActivateSignalId); - g_signal_handler_block(m_pComboBoxText, m_nChangedSignalId); - g_signal_handler_block(m_pComboBoxText, m_nPopupShownSignalId); + g_signal_handler_block(m_pComboBox, m_nChangedSignalId); + g_signal_handler_block(m_pComboBox, m_nPopupShownSignalId); GtkInstanceContainer::disable_notify_events(); } virtual void enable_notify_events() override { GtkInstanceContainer::enable_notify_events(); - g_signal_handler_unblock(m_pComboBoxText, m_nPopupShownSignalId); - g_signal_handler_unblock(m_pComboBoxText, m_nChangedSignalId); + g_signal_handler_unblock(m_pComboBox, m_nPopupShownSignalId); + g_signal_handler_unblock(m_pComboBox, m_nChangedSignalId); if (GtkEntry* pEntry = get_entry()) g_signal_handler_unblock(pEntry, m_nEntryActivateSignalId); } @@ -4927,7 +4927,7 @@ public: GtkInstanceContainer::freeze(); if (m_xSorter) { - GtkTreeModel* pModel = gtk_combo_box_get_model(m_pComboBoxText); + GtkTreeModel* pModel = gtk_combo_box_get_model(m_pComboBox); GtkTreeSortable* pSortable = GTK_TREE_SORTABLE(pModel); gtk_tree_sortable_set_sort_column_id(pSortable, GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, GTK_SORT_ASCENDING); } @@ -4937,19 +4937,19 @@ public: { if (m_xSorter) { - GtkTreeModel* pModel = gtk_combo_box_get_model(m_pComboBoxText); + GtkTreeModel* pModel = gtk_combo_box_get_model(m_pComboBox); GtkTreeSortable* pSortable = GTK_TREE_SORTABLE(pModel); gtk_tree_sortable_set_sort_column_id(pSortable, 0, GTK_SORT_ASCENDING); } GtkInstanceContainer::thaw(); } - virtual ~GtkInstanceComboBoxText() override + virtual ~GtkInstanceComboBox() override { if (GtkEntry* pEntry = get_entry()) g_signal_handler_disconnect(pEntry, m_nEntryActivateSignalId); - g_signal_handler_disconnect(m_pComboBoxText, m_nChangedSignalId); - g_signal_handler_disconnect(m_pComboBoxText, m_nPopupShownSignalId); + g_signal_handler_disconnect(m_pComboBox, m_nChangedSignalId); + g_signal_handler_disconnect(m_pComboBox, m_nPopupShownSignalId); } }; @@ -5494,13 +5494,13 @@ public: return o3tl::make_unique<weld::TimeSpinButton>(weld_spin_button(id, bTakeOwnership), eFormat); } - virtual std::unique_ptr<weld::ComboBoxText> weld_combo_box_text(const OString &id, bool bTakeOwnership) override + virtual std::unique_ptr<weld::ComboBox> weld_combo_box(const OString &id, bool bTakeOwnership) override { - GtkComboBox* pComboBoxText = GTK_COMBO_BOX(gtk_builder_get_object(m_pBuilder, id.getStr())); - if (!pComboBoxText) + GtkComboBox* pComboBox = GTK_COMBO_BOX(gtk_builder_get_object(m_pBuilder, id.getStr())); + if (!pComboBox) return nullptr; - auto_add_parentless_widgets_to_container(GTK_WIDGET(pComboBoxText)); - return o3tl::make_unique<GtkInstanceComboBoxText>(pComboBoxText, bTakeOwnership); + auto_add_parentless_widgets_to_container(GTK_WIDGET(pComboBox)); + return o3tl::make_unique<GtkInstanceComboBox>(pComboBox, bTakeOwnership); } virtual std::unique_ptr<weld::TreeView> weld_tree_view(const OString &id, bool bTakeOwnership) override diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx index 8b173e34026d..81e0363a568d 100644 --- a/writerperfect/inc/WPFTEncodingDialog.hxx +++ b/writerperfect/inc/WPFTEncodingDialog.hxx @@ -33,7 +33,7 @@ public: private: bool m_userHasCancelled; - std::unique_ptr<weld::ComboBoxText> m_xLbCharset; + std::unique_ptr<weld::ComboBox> m_xLbCharset; std::unique_ptr<weld::Button> m_xBtnOk; std::unique_ptr<weld::Button> m_xBtnCancel; diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx index a86d888466b2..fe812fc71ee2 100644 --- a/writerperfect/source/common/WPFTEncodingDialog.cxx +++ b/writerperfect/source/common/WPFTEncodingDialog.cxx @@ -78,18 +78,15 @@ std::pair<OUStringLiteral, OUStringLiteral> const s_encodings[] std::size_t const numEncodings = SAL_N_ELEMENTS(s_encodings); -void insertEncodings(weld::ComboBoxText& box) +void insertEncodings(weld::ComboBox& box) { for (std::size_t i = 0; i < numEncodings; ++i) box.append(s_encodings[i].first, s_encodings[i].second); } -void selectEncoding(weld::ComboBoxText& box, const OUString& encoding) -{ - box.set_active_id(encoding); -} +void selectEncoding(weld::ComboBox& box, const OUString& encoding) { box.set_active_id(encoding); } -OUString getEncoding(const weld::ComboBoxText& box) { return box.get_active_id(); } +OUString getEncoding(const weld::ComboBox& box) { return box.get_active_id(); } } WPFTEncodingDialog::WPFTEncodingDialog(weld::Window* pParent, const OUString& title, @@ -97,7 +94,7 @@ WPFTEncodingDialog::WPFTEncodingDialog(weld::Window* pParent, const OUString& ti : GenericDialogController(pParent, "writerperfect/ui/wpftencodingdialog.ui", "WPFTEncodingDialog") , m_userHasCancelled(false) - , m_xLbCharset(m_xBuilder->weld_combo_box_text("comboboxtext")) + , m_xLbCharset(m_xBuilder->weld_combo_box("comboboxtext")) , m_xBtnOk(m_xBuilder->weld_button("ok")) , m_xBtnCancel(m_xBuilder->weld_button("cancel")) { diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx b/writerperfect/source/writer/EPUBExportDialog.cxx index 935858dfd27d..9b3d5618a492 100644 --- a/writerperfect/source/writer/EPUBExportDialog.cxx +++ b/writerperfect/source/writer/EPUBExportDialog.cxx @@ -77,9 +77,9 @@ EPUBExportDialog::EPUBExportDialog(weld::Window* pParent, , m_xContext(std::move(xContext)) , m_rFilterData(rFilterData) , m_xSourceDocument(std::move(xDocument)) - , m_xVersion(m_xBuilder->weld_combo_box_text("versionlb")) - , m_xSplit(m_xBuilder->weld_combo_box_text("splitlb")) - , m_xLayout(m_xBuilder->weld_combo_box_text("layoutlb")) + , m_xVersion(m_xBuilder->weld_combo_box("versionlb")) + , m_xSplit(m_xBuilder->weld_combo_box("splitlb")) + , m_xLayout(m_xBuilder->weld_combo_box("layoutlb")) , m_xCoverPath(m_xBuilder->weld_entry("coverpath")) , m_xCoverButton(m_xBuilder->weld_button("coverbutton")) , m_xMediaDir(m_xBuilder->weld_entry("mediadir")) @@ -160,19 +160,19 @@ EPUBExportDialog::EPUBExportDialog(weld::Window* pParent, m_xOKButton->connect_clicked(LINK(this, EPUBExportDialog, OKClickHdl)); } -IMPL_LINK_NOARG(EPUBExportDialog, VersionSelectHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(EPUBExportDialog, VersionSelectHdl, weld::ComboBox&, void) { m_rFilterData["EPUBVersion"] <<= PositionToVersion(m_xVersion->get_active()); } -IMPL_LINK_NOARG(EPUBExportDialog, SplitSelectHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(EPUBExportDialog, SplitSelectHdl, weld::ComboBox&, void) { // No conversion, 1:1 mapping between entry positions and // libepubgen::EPUBSplitMethod. m_rFilterData["EPUBSplitMethod"] <<= static_cast<sal_Int32>(m_xSplit->get_active()); } -IMPL_LINK_NOARG(EPUBExportDialog, LayoutSelectHdl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(EPUBExportDialog, LayoutSelectHdl, weld::ComboBox&, void) { // No conversion, 1:1 mapping between entry positions and // libepubgen::EPUBLayoutMethod. diff --git a/writerperfect/source/writer/EPUBExportDialog.hxx b/writerperfect/source/writer/EPUBExportDialog.hxx index 6852b11a6bbb..819022531b13 100644 --- a/writerperfect/source/writer/EPUBExportDialog.hxx +++ b/writerperfect/source/writer/EPUBExportDialog.hxx @@ -29,9 +29,9 @@ public: ~EPUBExportDialog() override; private: - DECL_LINK(VersionSelectHdl, weld::ComboBoxText&, void); - DECL_LINK(SplitSelectHdl, weld::ComboBoxText&, void); - DECL_LINK(LayoutSelectHdl, weld::ComboBoxText&, void); + DECL_LINK(VersionSelectHdl, weld::ComboBox&, void); + DECL_LINK(SplitSelectHdl, weld::ComboBox&, void); + DECL_LINK(LayoutSelectHdl, weld::ComboBox&, void); DECL_LINK(CoverClickHdl, weld::Button&, void); DECL_LINK(MediaClickHdl, weld::Button&, void); DECL_LINK(OKClickHdl, weld::Button&, void); @@ -40,9 +40,9 @@ private: comphelper::SequenceAsHashMap& m_rFilterData; css::uno::Reference<css::lang::XComponent> m_xSourceDocument; - std::unique_ptr<weld::ComboBoxText> m_xVersion; - std::unique_ptr<weld::ComboBoxText> m_xSplit; - std::unique_ptr<weld::ComboBoxText> m_xLayout; + std::unique_ptr<weld::ComboBox> m_xVersion; + std::unique_ptr<weld::ComboBox> m_xSplit; + std::unique_ptr<weld::ComboBox> m_xLayout; std::unique_ptr<weld::Entry> m_xCoverPath; std::unique_ptr<weld::Button> m_xCoverButton; std::unique_ptr<weld::Entry> m_xMediaDir; |