diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-04-25 20:17:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-04-25 22:43:39 +0200 |
| commit | d26d1da82f0625ce1e5a99cc0081b1fcf422b315 (patch) | |
| tree | 5f4fa18baa60dc09f24b4681dc04b3a76599244e | |
| parent | 33966ab25d21594a3a4f40ce30ece73fa4f45a27 (diff) | |
rename SvtValueSet back to ValueSet
Change-Id: I51ab96ffef7acc0d416d13ac8e380e49381f4d1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92902
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
92 files changed, 486 insertions, 487 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index d9c98d2b7888..6153c03ede8f 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -327,7 +327,7 @@ void ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame xDiaProp->setPropertyValue(CHART_UNONAME_SORT_BY_XVALUES, uno::Any(rParameter.bSortByXValues)); } } -void ChartTypeDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) +void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); } @@ -416,7 +416,7 @@ const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTem {"com.sun.star.chart2.template.ThreeDColumnDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z)}}; return s_aTemplateMap; } -void ColumnChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) +void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); @@ -493,7 +493,7 @@ const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTempla {"com.sun.star.chart2.template.ThreeDBarDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z)}}; return s_aTemplateMap; } -void BarChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) +void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); @@ -570,7 +570,7 @@ const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTempla {"com.sun.star.chart2.template.ThreeDDonutAllExploded" , ChartTypeParameter(4,false,true)}}; return s_aTemplateMap; } -void PieChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) +void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); @@ -640,7 +640,7 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl {"com.sun.star.chart2.template.ThreeDLineDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true)}}; return s_aTemplateMap; } -void LineChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) +void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); @@ -780,7 +780,7 @@ const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplat return s_aTemplateMap; } -void XYChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) +void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); @@ -890,7 +890,7 @@ const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTempl return s_aTemplateMap; } -void AreaChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) +void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); @@ -986,7 +986,7 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla {"com.sun.star.chart2.template.PercentStackedFilledNet" ,ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y_PERCENT,false,false)}}; return s_aTemplateMap; } -void NetChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) +void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); @@ -1065,7 +1065,7 @@ const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemp return s_aTemplateMap; } -void StockChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) +void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_STOCK_1)); @@ -1108,7 +1108,7 @@ const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogControlle return s_aTemplateMap; } -void CombiColumnLineChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) +void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_COLUMN_LINE)); @@ -1236,7 +1236,7 @@ const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTem {"com.sun.star.chart2.template.Bubble" , ChartTypeParameter(1,true)}}; return s_aTemplateMap; } -void BubbleChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) +void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_BUBBLE_1)); diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index f1e64add1370..271d4721cbe4 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -53,7 +53,7 @@ ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage, weld::DialogControlle , m_aTimerTriggeredControllerLock( m_xChartModel ) , m_xFT_ChooseType(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD")) , m_xMainTypeList(m_xBuilder->weld_tree_view("charttype")) - , m_xSubTypeList(new SvtValueSet(m_xBuilder->weld_scrolled_window("subtypewin"))) + , m_xSubTypeList(new ValueSet(m_xBuilder->weld_scrolled_window("subtypewin"))) , m_xSubTypeListWin(new weld::CustomWeld(*m_xBuilder, "subtype", *m_xSubTypeList)) { Size aSize(m_xSubTypeList->GetDrawingArea()->get_ref_device().LogicToPixel(Size(150, 50), MapMode(MapUnit::MapAppFont))); @@ -204,7 +204,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType() return pTypeController; } -IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void) { if( m_pCurrentMainType ) { diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index e5587afba4fd..df835f3b325d 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } namespace weld { class CustomWeld; } -class SvtValueSet; +class ValueSet; namespace chart { @@ -67,7 +67,7 @@ private: void selectMainType(); DECL_LINK(SelectMainTypeHdl, weld::TreeView&, void); - DECL_LINK(SelectSubTypeHdl, SvtValueSet*, void ); + DECL_LINK(SelectSubTypeHdl, ValueSet*, void ); std::unique_ptr<Dim3DLookResourceGroup> m_pDim3DLookResourceGroup; std::unique_ptr<StackingResourceGroup> m_pStackingResourceGroup; @@ -86,7 +86,7 @@ private: std::unique_ptr<weld::Label> m_xFT_ChooseType; std::unique_ptr<weld::TreeView> m_xMainTypeList; - std::unique_ptr<SvtValueSet> m_xSubTypeList; + std::unique_ptr<ValueSet> m_xSubTypeList; std::unique_ptr<weld::CustomWeld> m_xSubTypeListWin; }; diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx index d730a880b58a..ceea3b2186b6 100644 --- a/chart2/source/controller/sidebar/ChartTypePanel.cxx +++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx @@ -60,7 +60,7 @@ ChartTypePanel::ChartTypePanel(vcl::Window* pParent, , m_nChangingCalls(0) , m_aTimerTriggeredControllerLock(m_xChartModel) , m_xMainTypeList(m_xBuilder->weld_combo_box("cmb_chartType")) - , m_xSubTypeList(new SvtValueSet(m_xBuilder->weld_scrolled_window("subtypewin"))) + , m_xSubTypeList(new ValueSet(m_xBuilder->weld_scrolled_window("subtypewin"))) , m_xSubTypeListWin(new weld::CustomWeld(*m_xBuilder, "subtype", *m_xSubTypeList)) { Size aSize(m_xSubTypeList->GetDrawingArea()->get_ref_device().LogicToPixel( @@ -151,7 +151,7 @@ void ChartTypePanel::dispose() IMPL_LINK_NOARG(ChartTypePanel, SelectMainTypeHdl, weld::ComboBox&, void) { selectMainType(); } -IMPL_LINK_NOARG(ChartTypePanel, SelectSubTypeHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(ChartTypePanel, SelectSubTypeHdl, ValueSet*, void) { if (m_pCurrentMainType) { diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx b/chart2/source/controller/sidebar/ChartTypePanel.hxx index 087f6ba79525..3c9cce1178e8 100644 --- a/chart2/source/controller/sidebar/ChartTypePanel.hxx +++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx @@ -99,7 +99,7 @@ private: void selectMainType(); DECL_LINK(SelectMainTypeHdl, weld::ComboBox&, void); - DECL_LINK(SelectSubTypeHdl, SvtValueSet*, void); + DECL_LINK(SelectSubTypeHdl, ValueSet*, void); vcl::EnumContext maContext; @@ -126,7 +126,7 @@ private: TimerTriggeredControllerLock m_aTimerTriggeredControllerLock; std::unique_ptr<weld::ComboBox> m_xMainTypeList; - std::unique_ptr<SvtValueSet> m_xSubTypeList; + std::unique_ptr<ValueSet> m_xSubTypeList; std::unique_ptr<weld::CustomWeld> m_xSubTypeListWin; }; } diff --git a/chart2/source/inc/ChartTypeDialogController.hxx b/chart2/source/inc/ChartTypeDialogController.hxx index c3efe736ffc9..f65ce90a5008 100644 --- a/chart2/source/inc/ChartTypeDialogController.hxx +++ b/chart2/source/inc/ChartTypeDialogController.hxx @@ -83,7 +83,7 @@ class XMultiServiceFactory; } } -class SvtValueSet; +class ValueSet; namespace chart { @@ -140,7 +140,7 @@ public: virtual OUString getName() = 0; virtual OUString getImage() = 0; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const = 0; - virtual void fillSubTypeList(SvtValueSet& rSubTypeList, const ChartTypeParameter& rParameter); + virtual void fillSubTypeList(ValueSet& rSubTypeList, const ChartTypeParameter& rParameter); virtual bool shouldShow_3DLookControl() const; virtual bool shouldShow_StackingControl() const; @@ -199,7 +199,7 @@ public: virtual OUString getName() override; virtual OUString getImage() override; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const override; - virtual void fillSubTypeList(SvtValueSet& rSubTypeList, + virtual void fillSubTypeList(ValueSet& rSubTypeList, const ChartTypeParameter& rParameter) override; }; @@ -212,7 +212,7 @@ public: virtual OUString getName() override; virtual OUString getImage() override; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const override; - virtual void fillSubTypeList(SvtValueSet& rSubTypeList, + virtual void fillSubTypeList(ValueSet& rSubTypeList, const ChartTypeParameter& rParameter) override; }; @@ -225,7 +225,7 @@ public: virtual OUString getName() override; virtual OUString getImage() override; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const override; - virtual void fillSubTypeList(SvtValueSet& rSubTypeList, + virtual void fillSubTypeList(ValueSet& rSubTypeList, const ChartTypeParameter& rParameter) override; virtual void adjustParameterToSubType(ChartTypeParameter& rParameter) override; @@ -241,7 +241,7 @@ public: virtual OUString getName() override; virtual OUString getImage() override; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const override; - virtual void fillSubTypeList(SvtValueSet& rSubTypeList, + virtual void fillSubTypeList(ValueSet& rSubTypeList, const ChartTypeParameter& rParameter) override; virtual void adjustParameterToSubType(ChartTypeParameter& rParameter) override; virtual void adjustParameterToMainType(ChartTypeParameter& rParameter) override; @@ -259,7 +259,7 @@ public: virtual OUString getName() override; virtual OUString getImage() override; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const override; - virtual void fillSubTypeList(SvtValueSet& rSubTypeList, + virtual void fillSubTypeList(ValueSet& rSubTypeList, const ChartTypeParameter& rParameter) override; virtual void adjustParameterToSubType(ChartTypeParameter& rParameter) override; @@ -276,7 +276,7 @@ public: virtual OUString getName() override; virtual OUString getImage() override; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const override; - virtual void fillSubTypeList(SvtValueSet& rSubTypeList, + virtual void fillSubTypeList(ValueSet& rSubTypeList, const ChartTypeParameter& rParameter) override; virtual void adjustParameterToSubType(ChartTypeParameter& rParameter) override; virtual void adjustParameterToMainType(ChartTypeParameter& rParameter) override; @@ -293,7 +293,7 @@ public: virtual OUString getName() override; virtual OUString getImage() override; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const override; - virtual void fillSubTypeList(SvtValueSet& rSubTypeList, + virtual void fillSubTypeList(ValueSet& rSubTypeList, const ChartTypeParameter& rParameter) override; virtual void adjustParameterToSubType(ChartTypeParameter& rParameter) override; @@ -309,7 +309,7 @@ public: virtual OUString getName() override; virtual OUString getImage() override; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const override; - virtual void fillSubTypeList(SvtValueSet& rSubTypeList, + virtual void fillSubTypeList(ValueSet& rSubTypeList, const ChartTypeParameter& rParameter) override; virtual void adjustParameterToSubType(ChartTypeParameter& rParameter) override; }; @@ -322,7 +322,7 @@ public: virtual OUString getName() override; virtual OUString getImage() override; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const override; - virtual void fillSubTypeList(SvtValueSet& rSubTypeList, + virtual void fillSubTypeList(ValueSet& rSubTypeList, const ChartTypeParameter& rParameter) override; virtual void adjustParameterToSubType(ChartTypeParameter& rParameter) override; @@ -352,7 +352,7 @@ public: virtual OUString getName() override; virtual OUString getImage() override; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const override; - virtual void fillSubTypeList(SvtValueSet& rSubTypeList, + virtual void fillSubTypeList(ValueSet& rSubTypeList, const ChartTypeParameter& rParameter) override; virtual void adjustParameterToSubType(ChartTypeParameter& rParameter) override; }; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index d5b09321c096..89fc0f483bec 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2634,7 +2634,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog(weld::Window *pWindow, : GenericDialogController(pWindow, "cui/ui/iconselectordialog.ui", "IconSelector") , m_xImageManager(rXImageManager) , m_xParentImageManager(rXParentImageManager) - , m_xTbSymbol(new SvtValueSet(m_xBuilder->weld_scrolled_window("symbolswin"))) + , m_xTbSymbol(new ValueSet(m_xBuilder->weld_scrolled_window("symbolswin"))) , m_xTbSymbolWin(new weld::CustomWeld(*m_xBuilder, "symbolsToolbar", *m_xTbSymbol)) , m_xFtNote(m_xBuilder->weld_label("noteLabel")) , m_xBtnImport(m_xBuilder->weld_button("importButton")) @@ -2803,7 +2803,7 @@ uno::Reference< graphic::XGraphic> SvxIconSelectorDialog::GetSelectedIcon() return result; } -IMPL_LINK_NOARG(SvxIconSelectorDialog, SelectHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxIconSelectorDialog, SelectHdl, ValueSet*, void) { sal_uInt16 nId = m_xTbSymbol->GetSelectedItemId(); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 3c68eb9b5991..5e273b3b1d91 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -266,7 +266,7 @@ namespace svx } SuggestionSet::SuggestionSet(std::unique_ptr<weld::ScrolledWindow> xScrolledWindow) - : SvtValueSet(std::move(xScrolledWindow)) + : ValueSet(std::move(xScrolledWindow)) { } @@ -340,7 +340,7 @@ namespace svx implUpdateDisplay(); } - IMPL_LINK_NOARG(SuggestionDisplay, SelectSuggestionValueSetHdl, SvtValueSet*, void) + IMPL_LINK_NOARG(SuggestionDisplay, SelectSuggestionValueSetHdl, ValueSet*, void) { SelectSuggestionHdl(false); } diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 857ade2cc7b7..43c2fe0ee9eb 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -79,7 +79,7 @@ private: weld::TriStateEnabled m_aHyphenState; weld::TriStateEnabled m_aShrinkState; - SvtValueSet m_aVsRefEdge; + ValueSet m_aVsRefEdge; std::unique_ptr<weld::ComboBox> m_xLbHorAlign; std::unique_ptr<weld::Label> m_xFtIndent; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index a138620017e1..7af464924259 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -41,7 +41,7 @@ namespace editeng class ShadowControlsWrapper { public: - explicit ShadowControlsWrapper(SvtValueSet& rVsPos, weld::MetricSpinButton& rMfSize, ColorListBox& rLbColor); + explicit ShadowControlsWrapper(ValueSet& rVsPos, weld::MetricSpinButton& rMfSize, ColorListBox& rLbColor); SvxShadowItem GetControlValue(const SvxShadowItem& rItem) const; void SetControlValue(const SvxShadowItem& rItem); @@ -50,7 +50,7 @@ public: bool get_value_changed_from_saved() const; private: - SvtValueSet& mrVsPos; + ValueSet& mrVsPos; weld::MetricSpinButton& mrMfSize; ColorListBox& mrLbColor; }; @@ -121,7 +121,7 @@ private: // Controls svx::FrameSelector m_aFrameSel; - std::unique_ptr<SvtValueSet> m_xWndPresets; + std::unique_ptr<ValueSet> m_xWndPresets; std::unique_ptr<weld::CustomWeld> m_xWndPresetsWin; std::unique_ptr<weld::Label> m_xUserDefFT; std::unique_ptr<weld::CustomWeld> m_xFrameSelWin; @@ -142,7 +142,7 @@ private: std::unique_ptr<weld::CheckButton> m_xSynchronizeCB; std::unique_ptr<weld::Container> m_xShadowFrame; - std::unique_ptr<SvtValueSet> m_xWndShadows; + std::unique_ptr<ValueSet> m_xWndShadows; std::unique_ptr<weld::CustomWeld> m_xWndShadowsWin; std::unique_ptr<weld::Label> m_xFtShadowSize; std::unique_ptr<weld::MetricSpinButton> m_xEdShadowSize; @@ -161,8 +161,8 @@ private: // Handler DECL_LINK(SelStyleHdl_Impl, SvtLineListBox&, void); DECL_LINK(SelColHdl_Impl, ColorListBox&, void); - DECL_LINK(SelPreHdl_Impl, SvtValueSet*, void); - DECL_LINK(SelSdwHdl_Impl, SvtValueSet*, void); + DECL_LINK(SelPreHdl_Impl, ValueSet*, void); + DECL_LINK(SelSdwHdl_Impl, ValueSet*, void); DECL_LINK(LinesChanged_Impl, LinkParamNone*, void); DECL_LINK(ModifyDistanceHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(ModifyWidthHdl_Impl, weld::MetricSpinButton&, void); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index d6ad837edc84..f413495a17ff 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -632,7 +632,7 @@ private: std::vector<css::uno::Reference<css::graphic::XGraphic>> m_aGraphics; - std::unique_ptr<SvtValueSet> m_xTbSymbol; + std::unique_ptr<ValueSet> m_xTbSymbol; std::unique_ptr<weld::CustomWeld> m_xTbSymbolWin; std::unique_ptr<weld::Label> m_xFtNote; std::unique_ptr<weld::Button> m_xBtnImport; @@ -656,7 +656,7 @@ public: css::uno::Reference< css::graphic::XGraphic > GetSelectedIcon(); - DECL_LINK(SelectHdl, SvtValueSet*, void); + DECL_LINK(SelectHdl, ValueSet*, void); DECL_LINK(ImportHdl, weld::Button&, void); DECL_LINK(DeleteHdl, weld::Button&, void); }; diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 9ccac256260c..849b009c35df 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -379,7 +379,7 @@ private: DECL_LINK( ClickAddHdl_Impl, weld::Button&, void ); DECL_LINK( ClickModifyHdl_Impl, weld::Button&, void ); - DECL_LINK( ChangeGradientHdl, SvtValueSet*, void ); + DECL_LINK( ChangeGradientHdl, ValueSet*, void ); void ChangeGradientHdl_Impl(); DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); @@ -446,7 +446,7 @@ private: std::unique_ptr<weld::CustomWeld> m_xHatchLBWin; std::unique_ptr<weld::CustomWeld> m_xCtlPreview; - DECL_LINK(ChangeHatchHdl, SvtValueSet*, void); + DECL_LINK(ChangeHatchHdl, ValueSet*, void); void ChangeHatchHdl_Impl(); DECL_LINK( ModifiedEditHdl_Impl, weld::MetricSpinButton&, void ); DECL_LINK( ModifiedListBoxHdl_Impl, weld::ComboBox&, void ); @@ -527,7 +527,7 @@ private: std::unique_ptr<weld::CustomWeld> m_xCtlBitmapPreview; std::unique_ptr<weld::CustomWeld> m_xBitmapLBWin; - DECL_LINK( ModifyBitmapHdl, SvtValueSet*, void ); + DECL_LINK( ModifyBitmapHdl, ValueSet*, void ); DECL_LINK( ClickScaleHdl, weld::Button&, void ); DECL_LINK( ModifyBitmapStyleHdl, weld::ComboBox&, void ); DECL_LINK( ModifyBitmapSizeHdl, weld::MetricSpinButton&, void ); @@ -589,7 +589,7 @@ private: DECL_LINK( ClickAddHdl_Impl, weld::Button&, void ); DECL_LINK( ClickModifyHdl_Impl, weld::Button&, void ); - DECL_LINK( ChangePatternHdl_Impl, SvtValueSet*, void ); + DECL_LINK( ChangePatternHdl_Impl, ValueSet*, void ); DECL_LINK( ChangeColorHdl_Impl, ColorListBox&, void ); DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); @@ -695,7 +695,7 @@ private: DECL_LINK(ClickDeleteHdl_Impl, weld::Button&, void); DECL_LINK(SelectPaletteLBHdl, weld::ComboBox&, void); - DECL_LINK( SelectValSetHdl_Impl, SvtValueSet*, void ); + DECL_LINK( SelectValSetHdl_Impl, ValueSet*, void ); DECL_LINK( SelectColorModeHdl_Impl, weld::ToggleButton&, void ); void ChangeColor(const Color &rNewColor, bool bUpdatePreset = true); void SetColorModel(ColorModel eModel); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 9754b36b7c81..056aee15977d 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -33,7 +33,7 @@ namespace svx { - class SuggestionSet : public SvtValueSet + class SuggestionSet : public ValueSet { public: SuggestionSet(std::unique_ptr<weld::ScrolledWindow> xScrolledWindow); @@ -60,7 +60,7 @@ namespace svx OUString GetSelectedEntry() const; DECL_LINK( SelectSuggestionListBoxHdl, weld::TreeView&, void ); - DECL_LINK( SelectSuggestionValueSetHdl, SvtValueSet*, void ); + DECL_LINK( SelectSuggestionValueSetHdl, ValueSet*, void ); void SelectSuggestionHdl(bool bListBox); void SetHelpIds(); diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 792ce61fc1a0..d759df2e6e06 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -67,7 +67,7 @@ private: std::unique_ptr<weld::Label> m_xFT_LENGTHFT; std::unique_ptr<weld::MetricSpinButton> m_xMF_LENGTH; std::unique_ptr<weld::CheckButton> m_xCB_OPTIMAL; - std::unique_ptr<SvtValueSet> m_xCT_CAPTTYPE; + std::unique_ptr<ValueSet> m_xCT_CAPTTYPE; std::unique_ptr<weld::CustomWeld> m_xCT_CAPTTYPEWin; void SetupExtension_Impl( sal_uInt16 nType ); @@ -75,7 +75,7 @@ private: 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); + DECL_LINK(SelectCaptTypeHdl_Impl, ValueSet*, void); public: SvxCaptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 01eb4af82c3c..abce15b97d42 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -69,8 +69,8 @@ class SvxSingleNumPickTabPage final : public SfxTabPage std::unique_ptr<SvxNumValueSet> m_xExamplesVS; std::unique_ptr<weld::CustomWeld> m_xExamplesVSWin; - DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void); - DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxSingleNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); @@ -99,8 +99,8 @@ class SvxBulletPickTabPage final : public SfxTabPage std::unique_ptr<SvxNumValueSet> m_xExamplesVS; std::unique_ptr<weld::CustomWeld> m_xExamplesVSWin; - DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void); - DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxBulletPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SvxBulletPickTabPage() override; @@ -136,8 +136,8 @@ class SvxNumPickTabPage final : public SfxTabPage std::unique_ptr<SvxNumValueSet> m_xExamplesVS; std::unique_ptr<weld::CustomWeld> m_xExamplesVSWin; - DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void); - DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); @@ -174,8 +174,8 @@ class SvxBitmapPickTabPage final : public SfxTabPage std::unique_ptr<SvxBmpNumValueSet> m_xExamplesVS; std::unique_ptr<weld::CustomWeld> m_xExamplesVSWin; - DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void); - DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); DECL_LINK(ClickAddBrowseHdl_Impl, weld::Button&, void); public: diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 3d86942adce5..c77f2e4f434b 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -258,7 +258,7 @@ IMPL_LINK_NOARG( SvxDefaultColorOptPage, SelectPaletteLbHdl, weld::ComboBox&, vo m_xValSetColorBox->Resize(); } -IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, void) { sal_Int32 nIdx = m_xLbChartColors->get_selected_index(); if (nIdx != -1) diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 807fd294e8f3..eb9b1983b8c3 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -52,7 +52,7 @@ private: DECL_LINK(ResetToDefaults, weld::Button&, void); DECL_LINK(AddChartColor, weld::Button&, void); DECL_LINK(RemoveChartColor, weld::Button&, void); - DECL_LINK(BoxClickedHdl, SvtValueSet*, void); + DECL_LINK(BoxClickedHdl, ValueSet*, void); DECL_LINK(SelectPaletteLbHdl, weld::ComboBox&, void); void FillPaletteLB(); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 8d8dd161a204..82f9b6c3e0ab 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -87,7 +87,7 @@ const sal_uInt16 SVX_BORDER_PRESET_COUNT = 5; // number of shadow images to show const sal_uInt16 SVX_BORDER_SHADOW_COUNT = 5; -ShadowControlsWrapper::ShadowControlsWrapper(SvtValueSet& rVsPos, weld::MetricSpinButton& rMfSize, ColorListBox& rLbColor) +ShadowControlsWrapper::ShadowControlsWrapper(ValueSet& rVsPos, weld::MetricSpinButton& rMfSize, ColorListBox& rLbColor) : mrVsPos(rVsPos) , mrMfSize(rMfSize) , mrLbColor(rLbColor) @@ -245,7 +245,7 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle , mbSync(true) , mbRemoveAdjacentCellBorders(false) , bIsCalcDoc(false) - , m_xWndPresets(new SvtValueSet(nullptr)) + , m_xWndPresets(new ValueSet(nullptr)) , m_xWndPresetsWin(new weld::CustomWeld(*m_xBuilder, "presets", *m_xWndPresets)) , m_xUserDefFT(m_xBuilder->weld_label("userdefft")) , m_xFrameSelWin(new weld::CustomWeld(*m_xBuilder, "framesel", m_aFrameSel)) @@ -263,7 +263,7 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle , m_xBottomMF(m_xBuilder->weld_metric_spin_button("bottommf", FieldUnit::MM)) , m_xSynchronizeCB(m_xBuilder->weld_check_button("sync")) , m_xShadowFrame(m_xBuilder->weld_container("shadow")) - , m_xWndShadows(new SvtValueSet(nullptr)) + , m_xWndShadows(new ValueSet(nullptr)) , m_xWndShadowsWin(new weld::CustomWeld(*m_xBuilder, "shadows", *m_xWndShadows)) , m_xFtShadowSize(m_xBuilder->weld_label("distanceft")) , m_xEdShadowSize(m_xBuilder->weld_metric_spin_button("distancemf", FieldUnit::MM)) @@ -1070,7 +1070,7 @@ void SvxBorderTabPage::HideShadowControls() #define IID_PRE_TABLE_ALL 20 #define IID_PRE_TABLE_OUTER2 21 -IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) { const svx::FrameBorderState SHOW = svx::FrameBorderState::Show; const svx::FrameBorderState HIDE = svx::FrameBorderState::Hide; @@ -1140,7 +1140,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl, SvtValueSet*, void) UpdateRemoveAdjCellBorderCB( nLine + 1 ); } -IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void) { bool bEnable = m_xWndShadows->GetSelectedItemId() > 1; m_xFtShadowSize->set_sensitive(bEnable); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index a1f916c70a8b..39098871bd0b 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -88,7 +88,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(weld::Container* pPage, weld::DialogControl , m_xFT_LENGTHFT(m_xBuilder->weld_label("lengthft")) , m_xMF_LENGTH(m_xBuilder->weld_metric_spin_button("length", FieldUnit::MM)) , m_xCB_OPTIMAL(m_xBuilder->weld_check_button("optimal")) - , m_xCT_CAPTTYPE(new SvtValueSet(m_xBuilder->weld_scrolled_window("valuesetwin"))) + , m_xCT_CAPTTYPE(new ValueSet(m_xBuilder->weld_scrolled_window("valuesetwin"))) , m_xCT_CAPTTYPEWin(new weld::CustomWeld(*m_xBuilder, "valueset", *m_xCT_CAPTTYPE)) { Size aSize(m_xCT_CAPTTYPE->GetDrawingArea()->get_ref_device().LogicToPixel(Size(187, 38), MapMode(MapUnit::MapAppFont))); @@ -425,7 +425,7 @@ IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, weld::ToggleButton&, rButton, voi } } -IMPL_LINK_NOARG(SvxCaptionTabPage, SelectCaptTypeHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxCaptionTabPage, SelectCaptTypeHdl_Impl, ValueSet*, void) { SetupType_Impl( static_cast<SdrCaptionType>(m_xCT_CAPTTYPE->GetSelectedItemId()) ); } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index c2f5eae08b20..b2b53a8e1898 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -290,7 +290,7 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet* rSet ) *pActNum = *pSaveNum; } -IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(!pActNum) return; @@ -329,7 +329,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl, SvtValueSet*, void) } } -IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_xExamplesVS.get()); weld::Button& rOk = GetDialogController()->GetOKButton(); @@ -440,7 +440,7 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet ) *pActNum = *pSaveNum; } -IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(!pActNum) return; @@ -470,7 +470,7 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl, SvtValueSet*, void) } } -IMPL_LINK_NOARG(SvxBulletPickTabPage, DoubleClickHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_xExamplesVS.get()); weld::Button& rOk = GetDialogController()->GetOKButton(); @@ -625,7 +625,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet* rSet ) } // all levels are changed here -IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(!pActNum) return; @@ -707,7 +707,7 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl, SvtValueSet*, void) } } -IMPL_LINK_NOARG(SvxNumPickTabPage, DoubleClickHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_xExamplesVS.get()); weld::Button& rOk = GetDialogController()->GetOKButton(); @@ -867,7 +867,7 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet* rSet ) *pActNum = *pSaveNum; } -IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(!pActNum) return; @@ -904,7 +904,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl, SvtValueSet*, void) } } -IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_xExamplesVS.get()); weld::Button& rOk = GetDialogController()->GetOKButton(); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 70073f7e4fd3..87f22835adc3 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -458,7 +458,7 @@ void SvxBitmapTabPage::CalculateBitmapPresetSize() } } -IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapHdl, ValueSet*, void) { std::unique_ptr<GraphicObject> pGraphicObject; size_t nPos = m_xBitmapLB->GetSelectItemPos(); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index b5f0983162a5..62d6d321fe1c 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -97,7 +97,7 @@ SvxColorTabPage::SvxColorTabPage(weld::Container* pPage, weld::DialogController* // set handler m_xSelectPalette->connect_changed(LINK(this, SvxColorTabPage, SelectPaletteLBHdl)); - Link<SvtValueSet*, void> aValSelectLink = LINK(this, SvxColorTabPage, SelectValSetHdl_Impl); + Link<ValueSet*, void> aValSelectLink = LINK(this, SvxColorTabPage, SelectValSetHdl_Impl); m_xValSetColorList->SetSelectHdl(aValSelectLink); m_xValSetRecentList->SetSelectHdl(aValSelectLink); @@ -459,7 +459,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, weld::ComboBox&, void) m_xValSetColorList->Resize(); } -IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, SvtValueSet*, pValSet, void) +IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, pValSet, void) { sal_Int32 nPos = pValSet->GetSelectedItemId(); if( nPos == 0 ) diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 777bc5d70bd9..628c042ee709 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -486,7 +486,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void } } -IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl, ValueSet*, void) { ChangeGradientHdl_Impl(); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index d65c501f9d57..d1dbbc79aa30 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -340,7 +340,7 @@ void SvxHatchTabPage::ModifiedHdl_Impl( void const * p ) m_aCtlPreview.Invalidate(); } -IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl, ValueSet*, void) { ChangeHatchHdl_Impl(); } diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 613508b64a79..a22197d773f8 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -238,7 +238,7 @@ std::unique_ptr<SfxTabPage> SvxPatternTabPage::Create( weld::Container* pPage, w return std::make_unique<SvxPatternTabPage>(pPage, pController, *rSet); } -IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void) { std::unique_ptr<GraphicObject> pGraphicObject; size_t nPos = m_xPatternLB->GetSelectItemPos(); diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 8cdb5efd1fed..301a9c13047f 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -196,7 +196,7 @@ inline Color sameDistColor( Color /*rMain*/, Color rDefault ) return rDefault; } -class SvtValueSet; +class ValueSet; class SVT_DLLPUBLIC SvtLineListBox { @@ -249,7 +249,7 @@ private: SvxBorderLineStyle nStyle, BitmapEx& rBmp ); void UpdatePaintLineColor(); // returns sal_True if maPaintCol has changed - DECL_LINK(ValueSelectHdl, SvtValueSet*, void); + DECL_LINK(ValueSelectHdl, ValueSet*, void); DECL_LINK(FocusHdl, weld::Widget&, void); DECL_LINK(ToggleHdl, weld::ToggleButton&, void); DECL_LINK(NoneHdl, weld::Button&, void); @@ -274,7 +274,7 @@ private: std::unique_ptr<weld::Builder> m_xBuilder; std::unique_ptr<weld::Widget> m_xTopLevel; std::unique_ptr<weld::Button> m_xNoneButton; - std::unique_ptr<SvtValueSet> m_xLineSet; + std::unique_ptr<ValueSet> m_xLineSet; std::unique_ptr<weld::CustomWeld> m_xLineSetWin; std::vector<std::unique_ptr<ImpLineListData>> m_vLineList; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 8b55022f3ebd..c9b2ea3b86af 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -37,7 +37,6 @@ class UserDrawEvent; class VirtualDevice; struct ValueSetItem; -struct SvtValueSetItem; enum class DrawFrameStyle; @@ -46,7 +45,7 @@ enum class DrawFrameStyle; Description ============ -class SvtValueSet +class ValueSet This class allows the selection of an item. In the process items are drawn side by side. The selection of items can be more clear than in a @@ -177,7 +176,7 @@ to be set (before Show) with SetStyle(). *************************************************************************/ -typedef std::vector<std::unique_ptr<SvtValueSetItem>> SvtValueItemList; +typedef std::vector<std::unique_ptr<ValueSetItem>> ValueItemList; #define WB_ITEMBORDER (WinBits(0x00010000)) #define WB_DOUBLEBORDER (WinBits(0x00020000)) @@ -190,13 +189,13 @@ typedef std::vector<std::unique_ptr<SvtValueSetItem>> SvtValueItemList; #define VALUESET_APPEND (size_t(-1)) #define VALUESET_ITEM_NOTFOUND (size_t(-1)) -class SVT_DLLPUBLIC SvtValueSet : public weld::CustomWidgetController +class SVT_DLLPUBLIC ValueSet : public weld::CustomWidgetController { private: ScopedVclPtr<VirtualDevice> maVirDev; css::uno::Reference<css::accessibility::XAccessible> mxAccessible; - SvtValueItemList mItemList; - std::unique_ptr<SvtValueSetItem> mpNoneItem; + ValueItemList mItemList; + std::unique_ptr<ValueSetItem> mpNoneItem; std::unique_ptr<weld::ScrolledWindow> mxScrolledWindow; tools::Rectangle maNoneItemRect; tools::Rectangle maItemListRect; @@ -220,8 +219,8 @@ private: Color maColor; OUString maText; WinBits mnStyle; - Link<SvtValueSet*,void> maDoubleClickHdl; - Link<SvtValueSet*,void> maSelectHdl; + Link<ValueSet*,void> maDoubleClickHdl; + Link<ValueSet*,void> maSelectHdl; bool mbFormat : 1; bool mbHighlight : 1; @@ -234,21 +233,21 @@ private: bool mbEdgeBlending : 1; bool mbHasVisibleItems : 1; - friend class SvtValueSetAcc; - friend class SvtValueItemAcc; + friend class ValueItemAcc; + friend class ValueSetAcc; SVT_DLLPRIVATE void ImplDeleteItems(); - SVT_DLLPRIVATE void ImplFormatItem(vcl::RenderContext const & rRenderContext, SvtValueSetItem* pItem, tools::Rectangle aRect); + SVT_DLLPRIVATE void ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSetItem* pItem, tools::Rectangle aRect); SVT_DLLPRIVATE void ImplDrawItemText(vcl::RenderContext& rRenderContext, const OUString& rStr); SVT_DLLPRIVATE void ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel); SVT_DLLPRIVATE void ImplDrawSelect(vcl::RenderContext& rRenderContext); SVT_DLLPRIVATE void ImplHighlightItem(sal_uInt16 nItemId, bool bIsSelection = true); SVT_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext); SVT_DLLPRIVATE size_t ImplGetItem( const Point& rPoint ) const; - SVT_DLLPRIVATE SvtValueSetItem* ImplGetItem( size_t nPos ); - SVT_DLLPRIVATE SvtValueSetItem* ImplGetFirstItem(); + SVT_DLLPRIVATE ValueSetItem* ImplGetItem( size_t nPos ); + SVT_DLLPRIVATE ValueSetItem* ImplGetFirstItem(); SVT_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const; - SVT_DLLPRIVATE void ImplInsertItem( std::unique_ptr<SvtValueSetItem> pItem, const size_t nPos ); + SVT_DLLPRIVATE void ImplInsertItem( std::unique_ptr<ValueSetItem> pItem, const size_t nPos ); SVT_DLLPRIVATE tools::Rectangle ImplGetItemRect( size_t nPos ) const; SVT_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); SVT_DLLPRIVATE bool ImplHasAccessibleListeners(); @@ -258,16 +257,16 @@ private: Size GetLargestItemSize(); - SvtValueSet (const SvtValueSet &) = delete; - SvtValueSet & operator= (const SvtValueSet &) = delete; + ValueSet (const ValueSet &) = delete; + ValueSet & operator= (const ValueSet &) = delete; protected: virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; weld::ScrolledWindow* GetScrollBar() const { return mxScrolledWindow.get(); } public: - SvtValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow); - virtual ~SvtValueSet() override; + ValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow); + virtual ~ValueSet() override; virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; @@ -379,12 +378,12 @@ public: Size CalcItemSizePixel(const Size& rSize) const; int GetScrollWidth() const; - void SetSelectHdl(const Link<SvtValueSet*,void>& rLink) + void SetSelectHdl(const Link<ValueSet*,void>& rLink) { maSelectHdl = rLink; } - void SetDoubleClickHdl(const Link<SvtValueSet*,void>& rLink) + void SetDoubleClickHdl(const Link<ValueSet*,void>& rLink) { maDoubleClickHdl = rLink; } diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx index b78cb96af3f8..143627ffedb1 100644 --- a/include/svx/SvxColorValueSet.hxx +++ b/include/svx/SvxColorValueSet.hxx @@ -25,7 +25,7 @@ class XColorList; -class SVXCORE_DLLPUBLIC SvxColorValueSet : public SvtValueSet +class SVXCORE_DLLPUBLIC SvxColorValueSet : public ValueSet { public: SvxColorValueSet(std::unique_ptr<weld::ScrolledWindow> pWindow); diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx index 5ee3858c7731..f246ee6b2906 100644 --- a/include/svx/SvxPresetListBox.hxx +++ b/include/svx/SvxPresetListBox.hxx @@ -24,7 +24,7 @@ #include <svx/xtable.hxx> #include <tools/gen.hxx> -class SVXCORE_DLLPUBLIC SvxPresetListBox final : public SvtValueSet +class SVXCORE_DLLPUBLIC SvxPresetListBox final : public ValueSet { private: static constexpr sal_uInt32 nColCount = 3; diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 6ba24b93d078..ac141611d103 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -102,13 +102,13 @@ private: weld::Button* mpDefaultButton; Link<const NamedColor&, void> maSelectedLink; - DECL_LINK(SelectHdl, SvtValueSet*, void); + DECL_LINK(SelectHdl, ValueSet*, void); DECL_LINK(SelectPaletteHdl, weld::ComboBox&, void); DECL_LINK(AutoColorClickHdl, weld::Button&, void); DECL_LINK(OpenPickerClickHdl, weld::Button&, void); static bool SelectValueSetEntry(SvxColorValueSet* pColorSet, const Color& rColor); - static NamedColor GetSelectEntryColor(SvtValueSet const * pColorSet); + static NamedColor GetSelectEntryColor(ValueSet const * pColorSet); NamedColor GetAutoColor() const; public: diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index c492a1f143c5..12648ebd6a19 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -54,7 +54,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FontWorkGalleryDialog final : public wel std::vector<BitmapEx> maFavoritesHorizontal; - SvtValueSet maCtlFavorites; + ValueSet maCtlFavorites; std::unique_ptr<weld::CustomWeld> mxCtlFavorites; std::unique_ptr<weld::Button> mxOKButton; @@ -62,7 +62,7 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FontWorkGalleryDialog final : public wel void insertSelectedFontwork(); void fillFavorites(sal_uInt16 nThemeId); - DECL_LINK(DoubleClickFavoriteHdl, SvtValueSet*, void); + DECL_LINK(DoubleClickFavoriteHdl, ValueSet*, void); DECL_LINK(ClickOKHdl, weld::Button&, void ); public: diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index 9e46720c9a52..4bb37f68fd7a 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -86,7 +86,7 @@ public: bool SetGraphic( const INetURLObject& ); }; -class GalleryIconView final : public SvtValueSet +class GalleryIconView final : public ValueSet { private: std::unique_ptr<GalleryDragDrop> mxDragDropTargetHelper; diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index b25361510ecc..02ca9548bd45 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -26,19 +26,19 @@ class XLineWidthItem; class SfxObjectShell; -class SvtValueSet; +class ValueSet; class SvxLineStyleToolBoxControl; class SvxLineBox final : public WeldToolbarPopup { rtl::Reference<SvxLineStyleToolBoxControl> mxControl; - std::unique_ptr<SvtValueSet> mxLineStyleSet; + std::unique_ptr<ValueSet> mxLineStyleSet; std::unique_ptr<weld::CustomWeld> mxLineStyleSetWin; void FillControl(); void Fill(const XDashListRef &pList); - DECL_LINK(SelectHdl, SvtValueSet*, void); + DECL_LINK(SelectHdl, ValueSet*, void); virtual void GrabFocus() override; diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index 4b41a74c90c5..ed17989fff9e 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -46,7 +46,7 @@ enum class NumberingPageType BITMAP }; -class SVX_DLLPUBLIC SvxNumValueSet : public SvtValueSet +class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet { NumberingPageType ePageType; tools::Rectangle aOrgRect; diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx index 5b5d2123cb26..f60a0c848f0d 100644 --- a/include/svx/sidebar/LineWidthPopup.hxx +++ b/include/svx/sidebar/LineWidthPopup.hxx @@ -25,7 +25,7 @@ #include <vcl/weld.hxx> #include <array> -class SvtValueSet; +class ValueSet; namespace svx { namespace sidebar { @@ -59,7 +59,7 @@ private: std::unique_ptr<LineWidthValueSet> m_xVSWidth; std::unique_ptr<weld::CustomWeld> m_xVSWidthWin; - DECL_LINK(VSSelectHdl, SvtValueSet*, void); + DECL_LINK(VSSelectHdl, ValueSet*, void); DECL_LINK(MFModifyHdl, weld::MetricSpinButton&, void); DECL_LINK(FocusHdl, weld::Widget&, void); }; diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx index 6fed356191db..466fa3e05688 100644 --- a/include/svx/sidebar/ValueSetWithTextControl.hxx +++ b/include/svx/sidebar/ValueSetWithTextControl.hxx @@ -33,7 +33,7 @@ namespace svx { namespace sidebar { Especially, used for sidebar related controls. */ -class SVX_DLLPUBLIC ValueSetWithTextControl final : public SvtValueSet +class SVX_DLLPUBLIC ValueSetWithTextControl final : public ValueSet { public: ValueSetWithTextControl(); diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 62ee5cd1eaf7..0eea402d1f89 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -62,7 +62,7 @@ private: void FillPaletteLB(); DECL_LINK(SelectPaletteLBHdl, weld::ComboBox&, void); - DECL_LINK(TabBgColorDblClickHdl_Impl, SvtValueSet*, void); + DECL_LINK(TabBgColorDblClickHdl_Impl, ValueSet*, void); DECL_LINK(TabBgColorOKHdl_Impl, weld::Button&, void); }; diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 84241f5b655f..aa19882544c6 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -95,7 +95,7 @@ IMPL_LINK_NOARG(ScTabBgColorDlg, SelectPaletteLBHdl, weld::ComboBox&, void) } // Handler, called when color selection is changed -IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, SvtValueSet*, void) +IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, void) { sal_uInt16 nItemId = m_xTabBgColorSet->GetSelectedItemId(); Color aColor = nItemId ? ( m_xTabBgColorSet->GetItemColor( nItemId ) ) : COL_AUTO; diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 7a545963aff7..beae25ff03bd 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -92,7 +92,7 @@ void CellLineStylePopup::SetAllNoSel() mxCellLineStyleValueSet->Invalidate(); } -IMPL_LINK_NOARG(CellLineStylePopup, VSSelectHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(CellLineStylePopup, VSSelectHdl, ValueSet*, void) { const sal_uInt16 iPos(mxCellLineStyleValueSet->GetSelectedItemId()); SvxLineItem aLineItem(SID_FRAME_LINESTYLE); diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index e620751a96a5..29b10904f514 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -40,7 +40,7 @@ private: void Initialize(); void SetAllNoSel(); - DECL_LINK(VSSelectHdl, SvtValueSet*, void); + DECL_LINK(VSSelectHdl, ValueSet*, void); DECL_LINK(PBClickHdl, weld::Button&, void); public: diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx index dac0df57380f..624df4882efd 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx @@ -26,7 +26,7 @@ namespace sc::sidebar { CellLineStyleValueSet::CellLineStyleValueSet() - : SvtValueSet(nullptr) + : ValueSet(nullptr) , nSelItem(0) { } @@ -37,7 +37,7 @@ CellLineStyleValueSet::~CellLineStyleValueSet() void CellLineStyleValueSet::SetDrawingArea(weld::DrawingArea* pDrawingArea) { - SvtValueSet::SetDrawingArea(pDrawingArea); + ValueSet::SetDrawingArea(pDrawingArea); Size aSize = pDrawingArea->get_ref_device().LogicToPixel(Size(80, 12 * 9), MapMode(MapUnit::MapAppFont)); pDrawingArea->set_size_request(aSize.Width(), aSize.Height()); SetOutputSizePixel(aSize); diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx index 7dd340bfeb06..598975aa3afb 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx @@ -25,7 +25,7 @@ namespace sc { namespace sidebar { -class CellLineStyleValueSet : public SvtValueSet +class CellLineStyleValueSet : public ValueSet { private: sal_uInt16 nSelItem; diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index c9e0afdb821b..144797fd1a8e 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -608,7 +608,7 @@ void SdPublishingDlg::CreatePages() m_xPage5 = m_xBuilder->weld_container("page5"); m_xPage5_Title = m_xBuilder->weld_label("buttonStyleLabel"); m_xPage5_TextOnly = m_xBuilder->weld_check_button("textOnlyCheckbutton"); - m_xPage5_Buttons.reset(new SvtValueSet(m_xBuilder->weld_scrolled_window("buttonsDrawingareawin"))); + m_xPage5_Buttons.reset(new ValueSet(m_xBuilder->weld_scrolled_window("buttonsDrawingareawin"))); m_xPage5_ButtonsWnd.reset(new weld::CustomWeld(*m_xBuilder, "buttonsDrawingarea", *m_xPage5_Buttons)); aAssistentFunc.InsertControl(5, m_xPage5.get()); aAssistentFunc.InsertControl(5, m_xPage5_Title.get()); @@ -947,7 +947,7 @@ IMPL_LINK( SdPublishingDlg, ResolutionHdl, weld::Button&, rButton, void ) } // Clickhandler for the ValueSet with the bitmap-buttons -IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl, ValueSet*, void) { // if one bitmap-button is chosen, then disable TextOnly m_xPage5_TextOnly->set_active(false); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 1481576a629b..8c9ad5bdb8ed 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -362,11 +362,11 @@ size_t getPresetOffset( const sd::impl::TransitionEffect &rEffect ) namespace sd { -class TransitionPane : public SvtValueSet +class TransitionPane : public ValueSet { public: explicit TransitionPane(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow) - : SvtValueSet(std::move(pScrolledWindow)) + : ValueSet(std::move(pScrolledWindow)) { } @@ -380,7 +380,7 @@ public: { Size aSize = pDrawingArea->get_ref_device().LogicToPixel(Size(70, 88), MapMode(MapUnit::MapAppFont)); pDrawingArea->set_size_request(aSize.Width(), aSize.Height()); - SvtValueSet::SetDrawingArea(pDrawingArea); + ValueSet::SetDrawingArea(pDrawingArea); SetOutputSizePixel(aSize); SetStyle(GetStyle() | WB_ITEMBORDER | WB_FLATVALUESET | WB_VSCROLL); @@ -1011,7 +1011,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, PlayButtonClicked, weld::Button&, void) playCurrentEffect(); } -IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected, SvtValueSet*, void) +IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected, ValueSet*, void) { updateVariants( mxVS_TRANSITION_ICONS->GetSelectedItemId() - 1 ); applyToSelectedPages(); diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index 39c8b7ed58f4..c68e61c893d4 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -61,13 +61,13 @@ public: private: rtl::Reference<DisplayModeController> mxControl; std::unique_ptr<weld::Frame> mxFrame1; - std::unique_ptr<SvtValueSet> mxDisplayModeSet1; + std::unique_ptr<ValueSet> mxDisplayModeSet1; std::unique_ptr<weld::CustomWeld> mxDisplayModeSetWin1; std::unique_ptr<weld::Frame> mxFrame2; - std::unique_ptr<SvtValueSet> mxDisplayModeSet2; + std::unique_ptr<ValueSet> mxDisplayModeSet2; std::unique_ptr<weld::CustomWeld> mxDisplayModeSetWin2; - DECL_LINK(SelectValueSetHdl, SvtValueSet*, void); + DECL_LINK(SelectValueSetHdl, ValueSet*, void); }; struct snewfoil_value_info @@ -119,7 +119,7 @@ static const snewfoil_value_info mastermodes[] = }; -static void fillLayoutValueSet(SvtValueSet* pValue, const snewfoil_value_info* pInfo) +static void fillLayoutValueSet(ValueSet* pValue, const snewfoil_value_info* pInfo) { Size aLayoutItemSize; for( ; pInfo->mnId; pInfo++ ) @@ -148,10 +148,10 @@ DisplayModeToolbarMenu::DisplayModeToolbarMenu(DisplayModeController* pControl, : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "modules/simpress/ui/displaywindow.ui", "DisplayWindow") , mxControl(pControl) , mxFrame1(m_xBuilder->weld_frame("editframe")) - , mxDisplayModeSet1(new SvtValueSet(nullptr)) + , mxDisplayModeSet1(new ValueSet(nullptr)) , mxDisplayModeSetWin1(new weld::CustomWeld(*m_xBuilder, "valueset1", *mxDisplayModeSet1)) , mxFrame2(m_xBuilder->weld_frame("masterframe")) - , mxDisplayModeSet2(new SvtValueSet(nullptr)) + , mxDisplayModeSet2(new ValueSet(nullptr)) , mxDisplayModeSetWin2(new weld::CustomWeld(*m_xBuilder, "valueset2", *mxDisplayModeSet2)) { mxDisplayModeSet1->SetStyle(WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT); @@ -169,7 +169,7 @@ DisplayModeToolbarMenu::DisplayModeToolbarMenu(DisplayModeController* pControl, fillLayoutValueSet( mxDisplayModeSet2.get(), &mastermodes[0] ); } -IMPL_LINK( DisplayModeToolbarMenu, SelectValueSetHdl, SvtValueSet*, pControl, void ) +IMPL_LINK( DisplayModeToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void ) { OUString sCommandURL; OUString sImage; diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 6cfc26eb5eb3..2109c08ba888 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -61,16 +61,16 @@ public: protected: DECL_LINK(SelectToolbarMenuHdl, weld::Button&, void); - DECL_LINK(SelectValueSetHdl, SvtValueSet*, void); + DECL_LINK(SelectValueSetHdl, ValueSet*, void); void SelectHdl(AutoLayout eLayout); private: rtl::Reference<SlideLayoutController> mxControl; bool const mbInsertPage; std::unique_ptr<weld::Frame> mxFrame1; - std::unique_ptr<SvtValueSet> mxLayoutSet1; + std::unique_ptr<ValueSet> mxLayoutSet1; std::unique_ptr<weld::CustomWeld> mxLayoutSetWin1; std::unique_ptr<weld::Frame> mxFrame2; - std::unique_ptr<SvtValueSet> mxLayoutSet2; + std::unique_ptr<ValueSet> mxLayoutSet2; std::unique_ptr<weld::CustomWeld> mxLayoutSetWin2; std::unique_ptr<weld::Button> mxMoreButton; }; @@ -128,7 +128,7 @@ static const snewfoil_value_info_layout v_standard[] = {nullptr, nullptr, AUTOLAYOUT_NONE} }; -static void fillLayoutValueSet( SvtValueSet* pValue, const snewfoil_value_info_layout* pInfo ) +static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layout* pInfo ) { Size aLayoutItemSize; for( ; pInfo->mpStrResId; pInfo++ ) @@ -157,10 +157,10 @@ LayoutToolbarMenu::LayoutToolbarMenu(SlideLayoutController* pControl, weld::Widg , mxControl(pControl) , mbInsertPage(bInsertPage) , mxFrame1(m_xBuilder->weld_frame("horiframe")) - , mxLayoutSet1(new SvtValueSet(nullptr)) + , mxLayoutSet1(new ValueSet(nullptr)) , mxLayoutSetWin1(new weld::CustomWeld(*m_xBuilder, "valueset1", *mxLayoutSet1)) , mxFrame2(m_xBuilder->weld_frame("vertframe")) - , mxLayoutSet2(new SvtValueSet(nullptr)) + , mxLayoutSet2(new ValueSet(nullptr)) , mxLayoutSetWin2(new weld::CustomWeld(*m_xBuilder, "valueset2", *mxLayoutSet2)) , mxMoreButton(m_xBuilder->weld_button("more")) { @@ -247,7 +247,7 @@ LayoutToolbarMenu::LayoutToolbarMenu(SlideLayoutController* pControl, weld::Widg } } -IMPL_LINK(LayoutToolbarMenu, SelectValueSetHdl, SvtValueSet*, pLayoutSet, void) +IMPL_LINK(LayoutToolbarMenu, SelectValueSetHdl, ValueSet*, pLayoutSet, void) { SelectHdl(static_cast<AutoLayout>(pLayoutSet->GetSelectedItemId()-1)); } diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index bd5fd897af63..6593251299a7 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -45,7 +45,7 @@ SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell, , m_xCbxMasterPage(m_xBuilder->weld_check_button("masterpage")) , m_xCbxCheckMasters(m_xBuilder->weld_check_button("checkmasters")) , m_xBtnLoad(m_xBuilder->weld_button("load")) - , m_xVS(new SvtValueSet(m_xBuilder->weld_scrolled_window("selectwin"))) + , m_xVS(new ValueSet(m_xBuilder->weld_scrolled_window("selectwin"))) , m_xVSWin(new weld::CustomWeld(*m_xBuilder, "select", *m_xVS)) { m_xVSWin->set_size_request(m_xBtnLoad->get_approximate_digit_width() * 60, @@ -162,7 +162,7 @@ void SdPresLayoutDlg::FillValueSet() /** * DoubleClick handler */ -IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void) { m_xDialog->response(RET_OK); } diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx index 702a177bf182..c1c2cbe18e3b 100644 --- a/sd/source/ui/inc/SlideTransitionPane.hxx +++ b/sd/source/ui/inc/SlideTransitionPane.hxx @@ -88,7 +88,7 @@ private: DECL_LINK( PlayButtonClicked, weld::Button&, void ); DECL_LINK( AutoPreviewClicked, weld::ToggleButton&, void ); - DECL_LINK( TransitionSelected, SvtValueSet*, void ); + DECL_LINK( TransitionSelected, ValueSet*, void ); DECL_LINK( AdvanceSlideRadioButtonToggled, weld::ToggleButton&, void ); DECL_LINK( AdvanceTimeModified, weld::MetricSpinButton&, void ); DECL_LINK( VariantListBoxSelected, weld::ComboBox&, void ); diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index d93791b74700..6156fb44942d 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -122,7 +122,7 @@ private: std::unique_ptr<weld::Container> m_xPage5; std::unique_ptr<weld::Label> m_xPage5_Title; std::unique_ptr<weld::CheckButton> m_xPage5_TextOnly; - std::unique_ptr<SvtValueSet> m_xPage5_Buttons; + std::unique_ptr<ValueSet> m_xPage5_Buttons; std::unique_ptr<weld::CustomWeld> m_xPage5_ButtonsWnd; // page 6 controls @@ -182,7 +182,7 @@ private: DECL_LINK( ContentHdl, weld::Button&, void ); DECL_LINK( GfxFormatHdl, weld::Button&, void ); DECL_LINK( ResolutionHdl, weld::Button&, void ); - DECL_LINK( ButtonsHdl, SvtValueSet*, void ); + DECL_LINK( ButtonsHdl, ValueSet*, void ); DECL_LINK( ColorHdl, weld::Button&, void ); DECL_LINK( WebServerHdl, weld::Button&, void ); DECL_LINK( SlideChgHdl, weld::Button&, void ); diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index 2fe25a632bb0..ab3c921f006c 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -25,7 +25,7 @@ #include <vcl/weld.hxx> class SfxItemSet; -class SvtValueSet; +class ValueSet; namespace weld { class CustomWeld; } namespace sd { @@ -44,7 +44,7 @@ public: void GetAttr(SfxItemSet& rOutAttrs); - DECL_LINK(ClickLayoutHdl, SvtValueSet*, void); + DECL_LINK(ClickLayoutHdl, ValueSet*, void); DECL_LINK(ClickLoadHdl, weld::Button&, void); private: @@ -61,7 +61,7 @@ private: std::unique_ptr<weld::CheckButton> m_xCbxMasterPage; std::unique_ptr<weld::CheckButton> m_xCbxCheckMasters; std::unique_ptr<weld::Button> m_xBtnLoad; - std::unique_ptr<SvtValueSet> m_xVS; + std::unique_ptr<ValueSet> m_xVS; std::unique_ptr<weld::CustomWeld> m_xVSWin; void FillValueSet(); diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 614deb67b0a3..af19e712c751 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -127,13 +127,13 @@ static const snewfoil_value_info standard[] = {"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; -class LayoutValueSet : public SvtValueSet +class LayoutValueSet : public ValueSet { private: LayoutMenu& mrMenu; public: LayoutValueSet(LayoutMenu& rMenu) - : SvtValueSet(nullptr) + : ValueSet(nullptr) , mrMenu(rMenu) { } @@ -379,7 +379,7 @@ int LayoutMenu::CalculateRowCount (const Size&, int nColumnCount) return nRowCount; } -IMPL_LINK_NOARG(LayoutMenu, ClickHandler, SvtValueSet*, void) +IMPL_LINK_NOARG(LayoutMenu, ClickHandler, ValueSet*, void) { AssignLayoutToSelectedSlides( GetSelectedAutoLayout() ); } diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 97ba793492a8..ecafad4dbd34 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -164,7 +164,7 @@ private: /** When clicked then set the current page of the view in the center pane. */ - DECL_LINK(ClickHandler, SvtValueSet*, void); + DECL_LINK(ClickHandler, ValueSet*, void); DECL_LINK(StateChangeHandler, const OUString&, void); DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, void); DECL_LINK(WindowEventHandler, VclWindowEvent&, void); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index c9d51c6939b5..8c7e8d155ec2 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -157,7 +157,7 @@ OUString MasterPagesSelector::GetContextMenuUIFile() const return "modules/simpress/ui/mastermenu.ui"; } -IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler, SvtValueSet*, void) +IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler, ValueSet*, void) { // We use the framework to assign the clicked-on master page because we // so use the same mechanism as the context menu does (where we do not diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index a816cca70093..c988030bc5db 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -162,7 +162,7 @@ private: last seen. This value is used heuristically to speed up the lookup of an index for a token. */ - DECL_LINK(ClickHandler, SvtValueSet*, void); + DECL_LINK(ClickHandler, ValueSet*, void); DECL_LINK(RightClickHandler, const MouseEvent&, void); DECL_LINK(ContainerChangeListener, MasterPageContainerChangeEvent&, void); DECL_LINK(OnMenuItemSelected, Menu*, bool); diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx index 56863fc47f38..eda1eb4025a0 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.cxx +++ b/sd/source/ui/sidebar/PreviewValueSet.cxx @@ -26,7 +26,7 @@ static const int gnBorderWidth(3); static const int gnBorderHeight(3); PreviewValueSet::PreviewValueSet() - : SvtValueSet(nullptr) + : ValueSet(nullptr) , maPreviewSize(10,10) { SetStyle ( @@ -38,7 +38,7 @@ PreviewValueSet::PreviewValueSet() void PreviewValueSet::SetDrawingArea(weld::DrawingArea* pDrawingArea) { - SvtValueSet::SetDrawingArea(pDrawingArea); + ValueSet::SetDrawingArea(pDrawingArea); SetColCount(2); SetExtraSpacing (2); @@ -65,12 +65,12 @@ bool PreviewValueSet::MouseButtonDown (const MouseEvent& rEvent) maRightMouseClickHandler.Call(rEvent); return true; } - return SvtValueSet::MouseButtonDown(rEvent); + return ValueSet::MouseButtonDown(rEvent); } void PreviewValueSet::Resize() { - SvtValueSet::Resize(); + ValueSet::Resize(); Size aWindowSize (GetOutputSizePixel()); if (!aWindowSize.IsEmpty()) diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx index ba50d481a206..915c822393c0 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.hxx +++ b/sd/source/ui/sidebar/PreviewValueSet.hxx @@ -26,7 +26,7 @@ namespace sd { namespace sidebar { /** Adapt the svtools valueset to the needs of the master page controls. */ -class PreviewValueSet : public SvtValueSet +class PreviewValueSet : public ValueSet { public: explicit PreviewValueSet(); diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 01aedcb24ca6..64009e7bfe77 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -142,7 +142,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase const & rBase ) return nullptr; } -IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl, ValueSet*, void) { ApplyStyle(); } @@ -280,7 +280,7 @@ void TableDesignWidget::onSelectionChanged() void TableValueSet::Resize() { - SvtValueSet::Resize(); + ValueSet::Resize(); // Calculate the number of rows and columns. if( GetItemCount() <= 0 ) return; @@ -316,7 +316,7 @@ void TableValueSet::Resize() } TableValueSet::TableValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow) - : SvtValueSet(std::move(pScrolledWindow)) + : ValueSet(std::move(pScrolledWindow)) , m_bModal(false) { } diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 9a2ca860dc43..d4aecb7127ec 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -48,7 +48,7 @@ enum TableCheckBox : sal_uInt16 CB_COUNT = CB_BANDED_COLUMNS + 1 }; -class TableValueSet : public SvtValueSet +class TableValueSet : public ValueSet { private: bool m_bModal; @@ -80,7 +80,7 @@ private: void FillDesignPreviewControl(); DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void); - DECL_LINK(implValueSetHdl, SvtValueSet*, void); + DECL_LINK(implValueSetHdl, ValueSet*, void); DECL_LINK(implCheckBoxHdl, weld::ToggleButton&, void); private: diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index b31ccc45d4a3..d1c2fe0be831 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1393,7 +1393,7 @@ SvtLineListBox::SvtLineListBox(std::unique_ptr<weld::MenuButton> pControl) , m_xBuilder(Application::CreateBuilder(m_xControl.get(), "svt/ui/linewindow.ui")) , m_xTopLevel(m_xBuilder->weld_widget("line_popup_window")) , m_xNoneButton(m_xBuilder->weld_button("none_line_button")) - , m_xLineSet(new SvtValueSet(nullptr)) + , m_xLineSet(new ValueSet(nullptr)) , m_xLineSetWin(new weld::CustomWeld(*m_xBuilder, "lineset", *m_xLineSet)) , m_nWidth( 5 ) , aVirDev(VclPtr<VirtualDevice>::Create()) @@ -1565,7 +1565,7 @@ Color SvtLineListBox::GetColorDist( sal_Int32 nPos ) return pData->GetColorDist( GetColor( ), rResult ); } -IMPL_LINK_NOARG(SvtLineListBox, ValueSelectHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvtLineListBox, ValueSelectHdl, ValueSet*, void) { maSelectHdl.Call(*this); UpdatePreview(); diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 5f5aafaad7c3..c43e8d070127 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; -SvtValueSetItem::SvtValueSetItem( SvtValueSet& rParent ) +ValueSetItem::ValueSetItem( ValueSet& rParent ) : mrParent(rParent) , mnId(0) , meType(VALUESETITEM_NONE) @@ -47,7 +47,7 @@ SvtValueSetItem::SvtValueSetItem( SvtValueSet& rParent ) } -SvtValueSetItem::~SvtValueSetItem() +ValueSetItem::~ValueSetItem() { if( mxAcc.is() ) { @@ -55,25 +55,25 @@ SvtValueSetItem::~SvtValueSetItem() } } -uno::Reference< accessibility::XAccessible > SvtValueSetItem::GetAccessible( bool bIsTransientChildrenDisabled ) +uno::Reference< accessibility::XAccessible > ValueSetItem::GetAccessible( bool bIsTransientChildrenDisabled ) { if( !mxAcc.is() ) - mxAcc = new SvtValueItemAcc( this, bIsTransientChildrenDisabled ); + mxAcc = new ValueItemAcc( this, bIsTransientChildrenDisabled ); return mxAcc.get(); } -SvtValueItemAcc::SvtValueItemAcc( SvtValueSetItem* pParent, bool bIsTransientChildrenDisabled ) : +ValueItemAcc::ValueItemAcc( ValueSetItem* pParent, bool bIsTransientChildrenDisabled ) : mpParent( pParent ), mbIsTransientChildrenDisabled( bIsTransientChildrenDisabled ) { } -SvtValueItemAcc::~SvtValueItemAcc() +ValueItemAcc::~ValueItemAcc() { } -void SvtValueItemAcc::ParentDestroyed() +void ValueItemAcc::ParentDestroyed() { const ::osl::MutexGuard aGuard( maMutex ); mpParent = nullptr; @@ -81,21 +81,21 @@ void SvtValueItemAcc::ParentDestroyed() namespace { - class theSvtValueItemAccUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvtValueItemAccUnoTunnelId > {}; + class theValueItemAccUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theValueItemAccUnoTunnelId > {}; } -const uno::Sequence< sal_Int8 >& SvtValueItemAcc::getUnoTunnelId() +const uno::Sequence< sal_Int8 >& ValueItemAcc::getUnoTunnelId() { - return theSvtValueItemAccUnoTunnelId::get().getSeq(); + return theValueItemAccUnoTunnelId::get().getSeq(); } -SvtValueItemAcc* SvtValueItemAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) +ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) throw() { try { - return comphelper::getUnoTunnelImplementation<SvtValueItemAcc>(rxData); + return comphelper::getUnoTunnelImplementation<ValueItemAcc>(rxData); } catch(const css::uno::Exception&) { @@ -104,25 +104,25 @@ SvtValueItemAcc* SvtValueItemAcc::getImplementation( const uno::Reference< uno:: } -uno::Reference< accessibility::XAccessibleContext > SAL_CALL SvtValueItemAcc::getAccessibleContext() +uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueItemAcc::getAccessibleContext() { return this; } -sal_Int32 SAL_CALL SvtValueItemAcc::getAccessibleChildCount() +sal_Int32 SAL_CALL ValueItemAcc::getAccessibleChildCount() { return 0; } -uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueItemAcc::getAccessibleChild( sal_Int32 ) +uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleChild( sal_Int32 ) { throw lang::IndexOutOfBoundsException(); } -uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueItemAcc::getAccessibleParent() +uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleParent() { const SolarMutexGuard aSolarGuard; uno::Reference< accessibility::XAccessible > xRet; @@ -134,7 +134,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueItemAcc::getAccess } -sal_Int32 SAL_CALL SvtValueItemAcc::getAccessibleIndexInParent() +sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent() { const SolarMutexGuard aSolarGuard; // The index defaults to -1 to indicate the child does not belong to its @@ -146,7 +146,7 @@ sal_Int32 SAL_CALL SvtValueItemAcc::getAccessibleIndexInParent() bool bDone = false; sal_uInt16 nCount = mpParent->mrParent.ImplGetVisibleItemCount(); - SvtValueSetItem* pItem; + ValueSetItem* pItem; for (sal_uInt16 i=0; i<nCount && !bDone; i++) { // Guard the retrieval of the i-th child with a try/catch block @@ -173,7 +173,7 @@ sal_Int32 SAL_CALL SvtValueItemAcc::getAccessibleIndexInParent() //if this valueset contain a none field(common value is default), then we should increase the real index and set the noitem index value equal 0. if ( mpParent && ( (mpParent->mrParent.GetStyle() & WB_NONEFIELD) != 0 ) ) { - SvtValueSetItem* pFirstItem = mpParent->mrParent.ImplGetItem (VALUESET_ITEM_NONEITEM); + ValueSetItem* pFirstItem = mpParent->mrParent.ImplGetItem (VALUESET_ITEM_NONEITEM); if( pFirstItem && pFirstItem ->GetAccessible(mbIsTransientChildrenDisabled).get() == this ) nIndexInParent = 0; else @@ -183,19 +183,19 @@ sal_Int32 SAL_CALL SvtValueItemAcc::getAccessibleIndexInParent() } -sal_Int16 SAL_CALL SvtValueItemAcc::getAccessibleRole() +sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole() { return accessibility::AccessibleRole::LIST_ITEM; } -OUString SAL_CALL SvtValueItemAcc::getAccessibleDescription() +OUString SAL_CALL ValueItemAcc::getAccessibleDescription() { return OUString(); } -OUString SAL_CALL SvtValueItemAcc::getAccessibleName() +OUString SAL_CALL ValueItemAcc::getAccessibleName() { const SolarMutexGuard aSolarGuard; @@ -211,13 +211,13 @@ OUString SAL_CALL SvtValueItemAcc::getAccessibleName() } -uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL SvtValueItemAcc::getAccessibleRelationSet() +uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueItemAcc::getAccessibleRelationSet() { return uno::Reference< accessibility::XAccessibleRelationSet >(); } -uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL SvtValueItemAcc::getAccessibleStateSet() +uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getAccessibleStateSet() { const SolarMutexGuard aSolarGuard; ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper; @@ -247,7 +247,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL SvtValueItemAcc::g } -lang::Locale SAL_CALL SvtValueItemAcc::getLocale() +lang::Locale SAL_CALL ValueItemAcc::getLocale() { const SolarMutexGuard aSolarGuard; uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() ); @@ -265,7 +265,7 @@ lang::Locale SAL_CALL SvtValueItemAcc::getLocale() } -void SAL_CALL SvtValueItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) +void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) { const ::osl::MutexGuard aGuard( maMutex ); @@ -288,7 +288,7 @@ void SAL_CALL SvtValueItemAcc::addAccessibleEventListener( const uno::Reference< } -void SAL_CALL SvtValueItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) +void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) { const ::osl::MutexGuard aGuard( maMutex ); @@ -303,7 +303,7 @@ void SAL_CALL SvtValueItemAcc::removeAccessibleEventListener( const uno::Referen } -sal_Bool SAL_CALL SvtValueItemAcc::containsPoint( const awt::Point& aPoint ) +sal_Bool SAL_CALL ValueItemAcc::containsPoint( const awt::Point& aPoint ) { const awt::Rectangle aRect( getBounds() ); const Point aSize( aRect.Width, aRect.Height ); @@ -312,13 +312,13 @@ sal_Bool SAL_CALL SvtValueItemAcc::containsPoint( const awt::Point& aPoint ) return tools::Rectangle( aNullPoint, aSize ).IsInside( aTestPoint ); } -uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueItemAcc::getAccessibleAtPoint( const awt::Point& ) +uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleAtPoint( const awt::Point& ) { uno::Reference< accessibility::XAccessible > xRet; return xRet; } -awt::Rectangle SAL_CALL SvtValueItemAcc::getBounds() +awt::Rectangle SAL_CALL ValueItemAcc::getBounds() { const SolarMutexGuard aSolarGuard; awt::Rectangle aRet; @@ -339,7 +339,7 @@ awt::Rectangle SAL_CALL SvtValueItemAcc::getBounds() return aRet; } -awt::Point SAL_CALL SvtValueItemAcc::getLocation() +awt::Point SAL_CALL ValueItemAcc::getLocation() { const awt::Rectangle aRect( getBounds() ); awt::Point aRet; @@ -350,7 +350,7 @@ awt::Point SAL_CALL SvtValueItemAcc::getLocation() return aRet; } -awt::Point SAL_CALL SvtValueItemAcc::getLocationOnScreen() +awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen() { const SolarMutexGuard aSolarGuard; awt::Point aRet; @@ -367,7 +367,7 @@ awt::Point SAL_CALL SvtValueItemAcc::getLocationOnScreen() return aRet; } -awt::Size SAL_CALL SvtValueItemAcc::getSize() +awt::Size SAL_CALL ValueItemAcc::getSize() { const awt::Rectangle aRect( getBounds() ); awt::Size aRet; @@ -378,18 +378,18 @@ awt::Size SAL_CALL SvtValueItemAcc::getSize() return aRet; } -void SAL_CALL SvtValueItemAcc::grabFocus() +void SAL_CALL ValueItemAcc::grabFocus() { // nothing to do } -sal_Int32 SAL_CALL SvtValueItemAcc::getForeground( ) +sal_Int32 SAL_CALL ValueItemAcc::getForeground( ) { Color nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor(); return static_cast<sal_Int32>(nColor); } -sal_Int32 SAL_CALL SvtValueItemAcc::getBackground( ) +sal_Int32 SAL_CALL ValueItemAcc::getBackground( ) { Color nColor; if (mpParent && mpParent->meType == VALUESETITEM_COLOR) @@ -399,11 +399,11 @@ sal_Int32 SAL_CALL SvtValueItemAcc::getBackground( ) return static_cast<sal_Int32>(nColor); } -sal_Int64 SAL_CALL SvtValueItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) +sal_Int64 SAL_CALL ValueItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) { sal_Int64 nRet; - if( isUnoTunnelId<SvtValueItemAcc>(rId) ) + if( isUnoTunnelId<ValueItemAcc>(rId) ) nRet = reinterpret_cast< sal_Int64 >( this ); else nRet = 0; @@ -411,7 +411,7 @@ sal_Int64 SAL_CALL SvtValueItemAcc::getSomething( const uno::Sequence< sal_Int8 return nRet; } -void SvtValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue ) +void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue ) { if( !nEventId ) return; @@ -430,7 +430,7 @@ void SvtValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldV } } -SvtValueSetAcc::SvtValueSetAcc( SvtValueSet* pParent ) : +ValueSetAcc::ValueSetAcc( ValueSet* pParent ) : ValueSetAccComponentBase (m_aMutex), mpParent( pParent ), mbIsFocused(false) @@ -438,12 +438,12 @@ SvtValueSetAcc::SvtValueSetAcc( SvtValueSet* pParent ) : } -SvtValueSetAcc::~SvtValueSetAcc() +ValueSetAcc::~ValueSetAcc() { } -void SvtValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue ) +void ValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue ) { if( !nEventId ) return; @@ -470,21 +470,21 @@ void SvtValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldVa namespace { - class theSvtValueSetAccUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvtValueSetAccUnoTunnelId > {}; + class theValueSetAccUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theValueSetAccUnoTunnelId > {}; } -const uno::Sequence< sal_Int8 >& SvtValueSetAcc::getUnoTunnelId() +const uno::Sequence< sal_Int8 >& ValueSetAcc::getUnoTunnelId() { - return theSvtValueSetAccUnoTunnelId::get().getSeq(); + return theValueSetAccUnoTunnelId::get().getSeq(); } -SvtValueSetAcc* SvtValueSetAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) +ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) throw() { try { - return comphelper::getUnoTunnelImplementation<SvtValueSetAcc>(rxData); + return comphelper::getUnoTunnelImplementation<ValueSetAcc>(rxData); } catch(const css::uno::Exception&) { @@ -493,7 +493,7 @@ SvtValueSetAcc* SvtValueSetAcc::getImplementation( const uno::Reference< uno::XI } -void SvtValueSetAcc::GetFocus() +void ValueSetAcc::GetFocus() { mbIsFocused = true; @@ -506,7 +506,7 @@ void SvtValueSetAcc::GetFocus() } -void SvtValueSetAcc::LoseFocus() +void ValueSetAcc::LoseFocus() { mbIsFocused = false; @@ -519,14 +519,14 @@ void SvtValueSetAcc::LoseFocus() } -uno::Reference< accessibility::XAccessibleContext > SAL_CALL SvtValueSetAcc::getAccessibleContext() +uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAccessibleContext() { ThrowIfDisposed(); return this; } -sal_Int32 SAL_CALL SvtValueSetAcc::getAccessibleChildCount() +sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount() { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -538,11 +538,11 @@ sal_Int32 SAL_CALL SvtValueSetAcc::getAccessibleChildCount() } -uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueSetAcc::getAccessibleChild( sal_Int32 i ) +uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleChild( sal_Int32 i ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - SvtValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(i)); + ValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(i)); if( !pItem ) throw lang::IndexOutOfBoundsException(); @@ -551,14 +551,14 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueSetAcc::getAccessi return xRet; } -uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueSetAcc::getAccessibleParent() +uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleParent() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; return mpParent->GetDrawingArea()->get_accessible_parent(); } -sal_Int32 SAL_CALL SvtValueSetAcc::getAccessibleIndexInParent() +sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -594,14 +594,14 @@ sal_Int32 SAL_CALL SvtValueSetAcc::getAccessibleIndexInParent() return nRet; } -sal_Int16 SAL_CALL SvtValueSetAcc::getAccessibleRole() +sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() { ThrowIfDisposed(); return accessibility::AccessibleRole::LIST; } -OUString SAL_CALL SvtValueSetAcc::getAccessibleDescription() +OUString SAL_CALL ValueSetAcc::getAccessibleDescription() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -616,7 +616,7 @@ OUString SAL_CALL SvtValueSetAcc::getAccessibleDescription() } -OUString SAL_CALL SvtValueSetAcc::getAccessibleName() +OUString SAL_CALL ValueSetAcc::getAccessibleName() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -630,14 +630,14 @@ OUString SAL_CALL SvtValueSetAcc::getAccessibleName() return aRet; } -uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL SvtValueSetAcc::getAccessibleRelationSet() +uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::getAccessibleRelationSet() { ThrowIfDisposed(); SolarMutexGuard g; return mpParent->GetDrawingArea()->get_accessible_relation_set(); } -uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL SvtValueSetAcc::getAccessibleStateSet() +uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAccessibleStateSet() { ThrowIfDisposed(); ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper(); @@ -656,7 +656,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL SvtValueSetAcc::ge } -lang::Locale SAL_CALL SvtValueSetAcc::getLocale() +lang::Locale SAL_CALL ValueSetAcc::getLocale() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -675,7 +675,7 @@ lang::Locale SAL_CALL SvtValueSetAcc::getLocale() } -void SAL_CALL SvtValueSetAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) +void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (m_aMutex); @@ -699,7 +699,7 @@ void SAL_CALL SvtValueSetAcc::addAccessibleEventListener( const uno::Reference< } -void SAL_CALL SvtValueSetAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) +void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (m_aMutex); @@ -715,7 +715,7 @@ void SAL_CALL SvtValueSetAcc::removeAccessibleEventListener( const uno::Referenc } -sal_Bool SAL_CALL SvtValueSetAcc::containsPoint( const awt::Point& aPoint ) +sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint ) { ThrowIfDisposed(); const awt::Rectangle aRect( getBounds() ); @@ -726,7 +726,7 @@ sal_Bool SAL_CALL SvtValueSetAcc::containsPoint( const awt::Point& aPoint ) } -uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueSetAcc::getAccessibleAtPoint( const awt::Point& aPoint ) +uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleAtPoint( const awt::Point& aPoint ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -739,7 +739,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueSetAcc::getAccessi if( VALUESET_ITEM_NONEITEM != nItemPos ) { - SvtValueSetItem *const pItem = mpParent->mItemList[nItemPos].get(); + ValueSetItem *const pItem = mpParent->mItemList[nItemPos].get(); xRet = pItem->GetAccessible( false/*bIsTransientChildrenDisabled*/ ); } } @@ -748,7 +748,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueSetAcc::getAccessi } -awt::Rectangle SAL_CALL SvtValueSetAcc::getBounds() +awt::Rectangle SAL_CALL ValueSetAcc::getBounds() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -764,7 +764,7 @@ awt::Rectangle SAL_CALL SvtValueSetAcc::getBounds() return aRet; } -awt::Point SAL_CALL SvtValueSetAcc::getLocation() +awt::Point SAL_CALL ValueSetAcc::getLocation() { ThrowIfDisposed(); const awt::Rectangle aRect( getBounds() ); @@ -776,7 +776,7 @@ awt::Point SAL_CALL SvtValueSetAcc::getLocation() return aRet; } -awt::Point SAL_CALL SvtValueSetAcc::getLocationOnScreen() +awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -787,7 +787,7 @@ awt::Point SAL_CALL SvtValueSetAcc::getLocationOnScreen() { uno::Reference<accessibility::XAccessibleContext> xParentContext(xParent->getAccessibleContext()); uno::Reference<accessibility::XAccessibleComponent> xParentComponent(xParentContext, css::uno::UNO_QUERY); - OSL_ENSURE( xParentComponent.is(), "SvtValueSetAcc::getLocationOnScreen: no parent component!" ); + OSL_ENSURE( xParentComponent.is(), "ValueSetAcc::getLocationOnScreen: no parent component!" ); if ( xParentComponent.is() ) { awt::Point aParentScreenLoc( xParentComponent->getLocationOnScreen() ); @@ -800,7 +800,7 @@ awt::Point SAL_CALL SvtValueSetAcc::getLocationOnScreen() return aScreenLoc; } -awt::Size SAL_CALL SvtValueSetAcc::getSize() +awt::Size SAL_CALL ValueSetAcc::getSize() { ThrowIfDisposed(); const awt::Rectangle aRect( getBounds() ); @@ -812,32 +812,32 @@ awt::Size SAL_CALL SvtValueSetAcc::getSize() return aRet; } -void SAL_CALL SvtValueSetAcc::grabFocus() +void SAL_CALL ValueSetAcc::grabFocus() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; mpParent->GrabFocus(); } -sal_Int32 SAL_CALL SvtValueSetAcc::getForeground( ) +sal_Int32 SAL_CALL ValueSetAcc::getForeground( ) { ThrowIfDisposed(); Color nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor(); return static_cast<sal_Int32>(nColor); } -sal_Int32 SAL_CALL SvtValueSetAcc::getBackground( ) +sal_Int32 SAL_CALL ValueSetAcc::getBackground( ) { ThrowIfDisposed(); Color nColor = Application::GetSettings().GetStyleSettings().GetWindowColor(); return static_cast<sal_Int32>(nColor); } -void SAL_CALL SvtValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - SvtValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex)); + ValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex)); if(pItem == nullptr) throw lang::IndexOutOfBoundsException(); @@ -846,11 +846,11 @@ void SAL_CALL SvtValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) } -sal_Bool SAL_CALL SvtValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - SvtValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex)); + ValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex)); if (pItem == nullptr) throw lang::IndexOutOfBoundsException(); @@ -860,7 +860,7 @@ sal_Bool SAL_CALL SvtValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildInd } -void SAL_CALL SvtValueSetAcc::clearAccessibleSelection() +void SAL_CALL ValueSetAcc::clearAccessibleSelection() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -868,14 +868,14 @@ void SAL_CALL SvtValueSetAcc::clearAccessibleSelection() } -void SAL_CALL SvtValueSetAcc::selectAllAccessibleChildren() +void SAL_CALL ValueSetAcc::selectAllAccessibleChildren() { ThrowIfDisposed(); // unsupported due to single selection only } -sal_Int32 SAL_CALL SvtValueSetAcc::getSelectedAccessibleChildCount() +sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -883,7 +883,7 @@ sal_Int32 SAL_CALL SvtValueSetAcc::getSelectedAccessibleChildCount() for( sal_uInt16 i = 0, nCount = getItemCount(); i < nCount; i++ ) { - SvtValueSetItem* pItem = getItem (i); + ValueSetItem* pItem = getItem (i); if( pItem && mpParent->IsItemSelected( pItem->mnId ) ) ++nRet; @@ -893,7 +893,7 @@ sal_Int32 SAL_CALL SvtValueSetAcc::getSelectedAccessibleChildCount() } -uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueSetAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -901,7 +901,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueSetAcc::getSelecte for( sal_uInt16 i = 0, nCount = getItemCount(), nSel = 0; ( i < nCount ) && !xRet.is(); i++ ) { - SvtValueSetItem* pItem = getItem(i); + ValueSetItem* pItem = getItem(i); if( pItem && mpParent->IsItemSelected( pItem->mnId ) && ( nSelectedChildIndex == static_cast< sal_Int32 >( nSel++ ) ) ) xRet = pItem->GetAccessible( false/*bIsTransientChildrenDisabled*/ ); @@ -911,7 +911,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvtValueSetAcc::getSelecte } -void SAL_CALL SvtValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -922,11 +922,11 @@ void SAL_CALL SvtValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) } -sal_Int64 SAL_CALL SvtValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) +sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) { sal_Int64 nRet; - if( isUnoTunnelId<SvtValueSetAcc>(rId) ) + if( isUnoTunnelId<ValueSetAcc>(rId) ) nRet = reinterpret_cast< sal_Int64 >( this ); else nRet = 0; @@ -935,7 +935,7 @@ sal_Int64 SAL_CALL SvtValueSetAcc::getSomething( const uno::Sequence< sal_Int8 > } -void SAL_CALL SvtValueSetAcc::disposing() +void SAL_CALL ValueSetAcc::disposing() { ::std::vector<uno::Reference<accessibility::XAccessibleEventListener> > aListenerListCopy; @@ -966,7 +966,7 @@ void SAL_CALL SvtValueSetAcc::disposing() } -sal_uInt16 SvtValueSetAcc::getItemCount() const +sal_uInt16 ValueSetAcc::getItemCount() const { sal_uInt16 nCount = mpParent->ImplGetVisibleItemCount(); // When the None-Item is visible then increase the number of items by @@ -976,9 +976,9 @@ sal_uInt16 SvtValueSetAcc::getItemCount() const return nCount; } -SvtValueSetItem* SvtValueSetAcc::getItem (sal_uInt16 nIndex) const +ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const { - SvtValueSetItem* pItem = nullptr; + ValueSetItem* pItem = nullptr; if (HasNoneField()) { @@ -996,7 +996,7 @@ SvtValueSetItem* SvtValueSetAcc::getItem (sal_uInt16 nIndex) const } -void SvtValueSetAcc::ThrowIfDisposed() +void ValueSetAcc::ThrowIfDisposed() { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -1007,13 +1007,13 @@ void SvtValueSetAcc::ThrowIfDisposed() } else { - DBG_ASSERT (mpParent!=nullptr, "SvtValueSetAcc not disposed but mpParent == NULL"); + DBG_ASSERT (mpParent!=nullptr, "ValueSetAcc not disposed but mpParent == NULL"); } } -bool SvtValueSetAcc::HasNoneField() const +bool ValueSetAcc::HasNoneField() const { - assert(mpParent && "SvtValueSetAcc::HasNoneField called with mpParent==NULL"); + assert(mpParent && "ValueSetAcc::HasNoneField called with mpParent==NULL"); return ((mpParent->GetStyle() & WB_NONEFIELD) != 0); } diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 4d1bb79ae25c..5f874acb99db 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -45,12 +45,12 @@ enum ValueSetItemType VALUESETITEM_USERDRAW }; -class SvtValueItemAcc; -class SvtValueSet; +class ValueItemAcc; +class ValueSet; -struct SvtValueSetItem +struct ValueSetItem { - SvtValueSet& mrParent; + ValueSet& mrParent; sal_uInt16 mnId; sal_uInt8 meType; bool mbVisible; @@ -58,10 +58,10 @@ struct SvtValueSetItem Color maColor; OUString maText; void* mpData; - rtl::Reference< SvtValueItemAcc > mxAcc; + rtl::Reference< ValueItemAcc > mxAcc; - explicit SvtValueSetItem( SvtValueSet& rParent ); - ~SvtValueSetItem(); + explicit ValueSetItem( ValueSet& rParent ); + ~ValueSetItem(); css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bIsTransientChildrenDisabled ); @@ -76,19 +76,19 @@ typedef ::cppu::WeakComponentImplHelper< css::lang::XUnoTunnel > ValueSetAccComponentBase; -class SvtValueSetAcc : +class ValueSetAcc : public ::cppu::BaseMutex, public ValueSetAccComponentBase { public: - explicit SvtValueSetAcc(SvtValueSet* pParent); - virtual ~SvtValueSetAcc() override; + explicit ValueSetAcc(ValueSet* pParent); + virtual ~ValueSetAcc() override; void FireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); } - static SvtValueSetAcc* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw(); + static ValueSetAcc* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw(); public: @@ -148,7 +148,7 @@ public: private: ::std::vector< css::uno::Reference< css::accessibility::XAccessibleEventListener > > mxEventListeners; - SvtValueSet* mpParent; + ValueSet* mpParent; /// The current FOCUSED state. bool mbIsFocused; @@ -170,7 +170,7 @@ private: @return Returns NULL when the given index is out of range. */ - SvtValueSetItem* getItem (sal_uInt16 nIndex) const; + ValueSetItem* getItem (sal_uInt16 nIndex) const; /** Check whether or not the object has been disposed (or is in the state of being disposed). If that is the case then @@ -189,7 +189,7 @@ private: bool HasNoneField() const; }; -class SvtValueItemAcc : public ::cppu::WeakImplHelper< css::accessibility::XAccessible, +class ValueItemAcc : public ::cppu::WeakImplHelper< css::accessibility::XAccessible, css::accessibility::XAccessibleEventBroadcaster, css::accessibility::XAccessibleContext, css::accessibility::XAccessibleComponent, @@ -200,19 +200,19 @@ private: ::std::vector< css::uno::Reference< css::accessibility::XAccessibleEventListener > > mxEventListeners; ::osl::Mutex maMutex; - SvtValueSetItem* mpParent; + ValueSetItem* mpParent; bool mbIsTransientChildrenDisabled; public: - SvtValueItemAcc(SvtValueSetItem* pParent, bool bIsTransientChildrenDisabled); - virtual ~SvtValueItemAcc() override; + ValueItemAcc(ValueSetItem* pParent, bool bIsTransientChildrenDisabled); + virtual ~ValueItemAcc() override; void ParentDestroyed(); void FireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); - static SvtValueItemAcc* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw(); + static ValueItemAcc* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw(); public: diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 90f3f362fe1f..f1b65e0565b5 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -63,7 +63,7 @@ enum } -SvtValueSet::SvtValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow) +ValueSet::ValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow) : maVirDev( VclPtr<VirtualDevice>::Create()) , mxScrolledWindow(std::move(pScrolledWindow)) , mnHighItemId(0) @@ -102,25 +102,25 @@ SvtValueSet::SvtValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow) if (mxScrolledWindow) { mxScrolledWindow->set_user_managed_scrolling(); - mxScrolledWindow->connect_vadjustment_changed(LINK(this, SvtValueSet, ImplScrollHdl)); + mxScrolledWindow->connect_vadjustment_changed(LINK(this, ValueSet, ImplScrollHdl)); } } -void SvtValueSet::SetDrawingArea(weld::DrawingArea* pDrawingArea) +void ValueSet::SetDrawingArea(weld::DrawingArea* pDrawingArea) { CustomWidgetController::SetDrawingArea(pDrawingArea); // #106446#, #106601# force mirroring of virtual device maVirDev->EnableRTL(pDrawingArea->get_direction()); } -Reference<XAccessible> SvtValueSet::CreateAccessible() +Reference<XAccessible> ValueSet::CreateAccessible() { if (!mxAccessible) - mxAccessible.set(new SvtValueSetAcc(this)); + mxAccessible.set(new ValueSetAcc(this)); return mxAccessible; } -SvtValueSet::~SvtValueSet() +ValueSet::~ValueSet() { Reference<XComponent> xComponent(mxAccessible, UNO_QUERY); if (xComponent.is()) @@ -129,13 +129,13 @@ SvtValueSet::~SvtValueSet() ImplDeleteItems(); } -void SvtValueSet::ImplDeleteItems() +void ValueSet::ImplDeleteItems() { const size_t n = mItemList.size(); for ( size_t i = 0; i < n; ++i ) { - SvtValueSetItem* pItem = mItemList[i].get(); + ValueSetItem* pItem = mItemList[i].get(); if ( pItem->mbVisible && ImplHasAccessibleListeners() ) { Any aOldAny; @@ -151,16 +151,16 @@ void SvtValueSet::ImplDeleteItems() mItemList.clear(); } -void SvtValueSet::Select() +void ValueSet::Select() { maSelectHdl.Call( this ); } -void SvtValueSet::UserDraw( const UserDrawEvent& ) +void ValueSet::UserDraw( const UserDrawEvent& ) { } -size_t SvtValueSet::ImplGetItem( const Point& rPos ) const +size_t ValueSet::ImplGetItem( const Point& rPos ) const { if (!mbHasVisibleItems) { @@ -197,7 +197,7 @@ size_t SvtValueSet::ImplGetItem( const Point& rPos ) const return VALUESET_ITEM_NOTFOUND; } -SvtValueSetItem* SvtValueSet::ImplGetItem( size_t nPos ) +ValueSetItem* ValueSet::ImplGetItem( size_t nPos ) { if (nPos == VALUESET_ITEM_NONEITEM) return mpNoneItem.get(); @@ -205,12 +205,12 @@ SvtValueSetItem* SvtValueSet::ImplGetItem( size_t nPos ) return (nPos < mItemList.size()) ? mItemList[nPos].get() : nullptr; } -SvtValueSetItem* SvtValueSet::ImplGetFirstItem() +ValueSetItem* ValueSet::ImplGetFirstItem() { return !mItemList.empty() ? mItemList[0].get() : nullptr; } -sal_uInt16 SvtValueSet::ImplGetVisibleItemCount() const +sal_uInt16 ValueSet::ImplGetVisibleItemCount() const { sal_uInt16 nRet = 0; const size_t nItemCount = mItemList.size(); @@ -224,21 +224,21 @@ sal_uInt16 SvtValueSet::ImplGetVisibleItemCount() const return nRet; } -void SvtValueSet::ImplFireAccessibleEvent( short nEventId, const Any& rOldValue, const Any& rNewValue ) +void ValueSet::ImplFireAccessibleEvent( short nEventId, const Any& rOldValue, const Any& rNewValue ) { - SvtValueSetAcc* pAcc = SvtValueSetAcc::getImplementation(mxAccessible); + ValueSetAcc* pAcc = ValueSetAcc::getImplementation(mxAccessible); if( pAcc ) pAcc->FireAccessibleEvent( nEventId, rOldValue, rNewValue ); } -bool SvtValueSet::ImplHasAccessibleListeners() +bool ValueSet::ImplHasAccessibleListeners() { - SvtValueSetAcc* pAcc = SvtValueSetAcc::getImplementation(mxAccessible); + ValueSetAcc* pAcc = ValueSetAcc::getImplementation(mxAccessible); return( pAcc && pAcc->HasAccessibleListeners() ); } -IMPL_LINK(SvtValueSet, ImplScrollHdl, weld::ScrolledWindow&, rScrollWin, void) +IMPL_LINK(ValueSet, ImplScrollHdl, weld::ScrolledWindow&, rScrollWin, void) { auto nNewFirstLine = rScrollWin.vadjustment_get_value(); if ( nNewFirstLine != mnFirstLine ) @@ -249,7 +249,7 @@ IMPL_LINK(SvtValueSet, ImplScrollHdl, weld::ScrolledWindow&, rScrollWin, void) } } -void SvtValueSet::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) +void ValueSet::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { if (GetStyle() & WB_FLATVALUESET) { @@ -264,31 +264,31 @@ void SvtValueSet::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang ImplDraw(rRenderContext); } -void SvtValueSet::GetFocus() +void ValueSet::GetFocus() { SAL_INFO("svtools", "value set getting focus"); Invalidate(); CustomWidgetController::GetFocus(); // Tell the accessible object that we got the focus. - SvtValueSetAcc* pAcc = SvtValueSetAcc::getImplementation(mxAccessible); + ValueSetAcc* pAcc = ValueSetAcc::getImplementation(mxAccessible); if (pAcc) pAcc->GetFocus(); } -void SvtValueSet::LoseFocus() +void ValueSet::LoseFocus() { SAL_INFO("svtools", "value set losing focus"); Invalidate(); CustomWidgetController::LoseFocus(); // Tell the accessible object that we lost the focus. - SvtValueSetAcc* pAcc = SvtValueSetAcc::getImplementation(mxAccessible); + ValueSetAcc* pAcc = ValueSetAcc::getImplementation(mxAccessible); if( pAcc ) pAcc->LoseFocus(); } -void SvtValueSet::Resize() +void ValueSet::Resize() { mbFormat = true; if ( IsReallyVisible() && IsUpdateMode() ) @@ -296,7 +296,7 @@ void SvtValueSet::Resize() CustomWidgetController::Resize(); } -bool SvtValueSet::KeyInput( const KeyEvent& rKeyEvent ) +bool ValueSet::KeyInput( const KeyEvent& rKeyEvent ) { size_t nLastItem = mItemList.size(); @@ -446,9 +446,9 @@ bool SvtValueSet::KeyInput( const KeyEvent& rKeyEvent ) return true; } -void SvtValueSet::ImplTracking(const Point& rPos) +void ValueSet::ImplTracking(const Point& rPos) { - SvtValueSetItem* pItem = ImplGetItem( ImplGetItem( rPos ) ); + ValueSetItem* pItem = ImplGetItem( ImplGetItem( rPos ) ); if ( pItem ) { if( GetStyle() & WB_MENUSTYLEVALUESET || GetStyle() & WB_FLATVALUESET ) @@ -465,11 +465,11 @@ void SvtValueSet::ImplTracking(const Point& rPos) } } -bool SvtValueSet::MouseButtonDown( const MouseEvent& rMouseEvent ) +bool ValueSet::MouseButtonDown( const MouseEvent& rMouseEvent ) { if ( rMouseEvent.IsLeft() ) { - SvtValueSetItem* pItem = ImplGetItem( ImplGetItem( rMouseEvent.GetPosPixel() ) ); + ValueSetItem* pItem = ImplGetItem( ImplGetItem( rMouseEvent.GetPosPixel() ) ); if (pItem && !rMouseEvent.IsMod2()) { if (rMouseEvent.GetClicks() == 1) @@ -489,7 +489,7 @@ bool SvtValueSet::MouseButtonDown( const MouseEvent& rMouseEvent ) return CustomWidgetController::MouseButtonDown( rMouseEvent ); } -bool SvtValueSet::MouseMove(const MouseEvent& rMouseEvent) +bool ValueSet::MouseMove(const MouseEvent& rMouseEvent) { // because of SelectionMode if ((GetStyle() & WB_MENUSTYLEVALUESET) || (GetStyle() & WB_FLATVALUESET)) @@ -497,7 +497,7 @@ bool SvtValueSet::MouseMove(const MouseEvent& rMouseEvent) return CustomWidgetController::MouseMove(rMouseEvent); } -void SvtValueSet::RemoveItem( sal_uInt16 nItemId ) +void ValueSet::RemoveItem( sal_uInt16 nItemId ) { size_t nPos = GetItemPos( nItemId ); @@ -524,7 +524,7 @@ void SvtValueSet::RemoveItem( sal_uInt16 nItemId ) Invalidate(); } -void SvtValueSet::RecalcScrollBar() +void ValueSet::RecalcScrollBar() { // reset scrolled window state to initial value // so it will get configured to the right adjustment @@ -533,7 +533,7 @@ void SvtValueSet::RecalcScrollBar() mxScrolledWindow->set_vpolicy(VclPolicyType::NEVER); } -void SvtValueSet::Clear() +void ValueSet::Clear() { ImplDeleteItems(); @@ -551,12 +551,12 @@ void SvtValueSet::Clear() Invalidate(); } -size_t SvtValueSet::GetItemCount() const +size_t ValueSet::GetItemCount() const { return mItemList.size(); } -size_t SvtValueSet::GetItemPos( sal_uInt16 nItemId ) const +size_t ValueSet::GetItemPos( sal_uInt16 nItemId ) const { for ( size_t i = 0, n = mItemList.size(); i < n; ++i ) { if ( mItemList[i]->mnId == nItemId ) { @@ -566,12 +566,12 @@ size_t SvtValueSet::GetItemPos( sal_uInt16 nItemId ) const return VALUESET_ITEM_NOTFOUND; } -sal_uInt16 SvtValueSet::GetItemId( size_t nPos ) const +sal_uInt16 ValueSet::GetItemId( size_t nPos ) const { return ( nPos < mItemList.size() ) ? mItemList[nPos]->mnId : 0 ; } -sal_uInt16 SvtValueSet::GetItemId( const Point& rPos ) const +sal_uInt16 ValueSet::GetItemId( const Point& rPos ) const { size_t nItemPos = ImplGetItem( rPos ); if ( nItemPos != VALUESET_ITEM_NOTFOUND ) @@ -580,7 +580,7 @@ sal_uInt16 SvtValueSet::GetItemId( const Point& rPos ) const return 0; } -tools::Rectangle SvtValueSet::GetItemRect( sal_uInt16 nItemId ) const +tools::Rectangle ValueSet::GetItemRect( sal_uInt16 nItemId ) const { const size_t nPos = GetItemPos( nItemId ); @@ -590,7 +590,7 @@ tools::Rectangle SvtValueSet::GetItemRect( sal_uInt16 nItemId ) const return tools::Rectangle(); } -tools::Rectangle SvtValueSet::ImplGetItemRect( size_t nPos ) const +tools::Rectangle ValueSet::ImplGetItemRect( size_t nPos ) const { const size_t nVisibleBegin = static_cast<size_t>(mnFirstLine)*mnCols; const size_t nVisibleEnd = nVisibleBegin + static_cast<size_t>(mnVisLines)*mnCols; @@ -610,7 +610,7 @@ tools::Rectangle SvtValueSet::ImplGetItemRect( size_t nPos ) const return tools::Rectangle( Point(x, y), Size(mnItemWidth, mnItemHeight) ); } -void SvtValueSet::ImplHighlightItem( sal_uInt16 nItemId, bool bIsSelection ) +void ValueSet::ImplHighlightItem( sal_uInt16 nItemId, bool bIsSelection ) { if ( mnHighItemId == nItemId ) return; @@ -627,7 +627,7 @@ void SvtValueSet::ImplHighlightItem( sal_uInt16 nItemId, bool bIsSelection ) mbDrawSelection = true; } -void SvtValueSet::ImplDraw(vcl::RenderContext& rRenderContext) +void ValueSet::ImplDraw(vcl::RenderContext& rRenderContext) { if (mbFormat) Format(rRenderContext); @@ -668,7 +668,7 @@ void SvtValueSet::ImplDraw(vcl::RenderContext& rRenderContext) * all of the included items and their labels fit; if we can * calculate that. */ -void SvtValueSet::RecalculateItemSizes() +void ValueSet::RecalculateItemSizes() { Size aLargestItem = GetLargestItemSize(); @@ -684,7 +684,7 @@ void SvtValueSet::RecalculateItemSizes() } } -void SvtValueSet::SelectItem( sal_uInt16 nItemId ) +void ValueSet::SelectItem( sal_uInt16 nItemId ) { size_t nItemPos = 0; @@ -748,7 +748,7 @@ void SvtValueSet::SelectItem( sal_uInt16 nItemId ) if( nPos != VALUESET_ITEM_NOTFOUND ) { - SvtValueItemAcc* pItemAcc = SvtValueItemAcc::getImplementation( + ValueItemAcc* pItemAcc = ValueItemAcc::getImplementation( mItemList[nPos]->GetAccessible( false/*bIsTransientChildrenDisabled*/ ) ); if( pItemAcc ) @@ -764,15 +764,15 @@ void SvtValueSet::SelectItem( sal_uInt16 nItemId ) // focus event (select) const size_t nPos = GetItemPos( mnSelItemId ); - SvtValueSetItem* pItem; + ValueSetItem* pItem; if( nPos != VALUESET_ITEM_NOTFOUND ) pItem = mItemList[nPos].get(); else pItem = mpNoneItem.get(); - SvtValueItemAcc* pItemAcc = nullptr; + ValueItemAcc* pItemAcc = nullptr; if (pItem != nullptr) - pItemAcc = SvtValueItemAcc::getImplementation( pItem->GetAccessible( false/*bIsTransientChildrenDisabled*/ ) ); + pItemAcc = ValueItemAcc::getImplementation( pItem->GetAccessible( false/*bIsTransientChildrenDisabled*/ ) ); if( pItemAcc ) { @@ -789,7 +789,7 @@ void SvtValueSet::SelectItem( sal_uInt16 nItemId ) } } -void SvtValueSet::SetNoSelection() +void ValueSet::SetNoSelection() { mbNoSelection = true; mbHighlight = false; @@ -798,7 +798,7 @@ void SvtValueSet::SetNoSelection() Invalidate(); } -void SvtValueSet::SetStyle(WinBits nStyle) +void ValueSet::SetStyle(WinBits nStyle) { if (nStyle != mnStyle) { @@ -808,7 +808,7 @@ void SvtValueSet::SetStyle(WinBits nStyle) } } -void SvtValueSet::Format(vcl::RenderContext const & rRenderContext) +void ValueSet::Format(vcl::RenderContext const & rRenderContext) { Size aWinSize(GetOutputSizePixel()); size_t nItemCount = mItemList.size(); @@ -1034,7 +1034,7 @@ void SvtValueSet::Format(vcl::RenderContext const & rRenderContext) if (nStyle & WB_NONEFIELD) { if (!mpNoneItem) - mpNoneItem.reset(new SvtValueSetItem(*this)); + mpNoneItem.reset(new ValueSetItem(*this)); mpNoneItem->mnId = 0; mpNoneItem->meType = VALUESETITEM_NONE; @@ -1069,7 +1069,7 @@ void SvtValueSet::Format(vcl::RenderContext const & rRenderContext) } for (size_t i = 0; i < nItemCount; i++) { - SvtValueSetItem* pItem = mItemList[i].get(); + ValueSetItem* pItem = mItemList[i].get(); if (i >= nFirstItem && i < nLastItem) { @@ -1126,7 +1126,7 @@ void SvtValueSet::Format(vcl::RenderContext const & rRenderContext) mbFormat = false; } -void SvtValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext) +void ValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext) { if (!IsReallyVisible()) return; @@ -1147,9 +1147,9 @@ void SvtValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext) } } -void SvtValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel ) +void ValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel ) { - SvtValueSetItem* pItem; + ValueSetItem* pItem; tools::Rectangle aRect; if (nItemId) { @@ -1267,7 +1267,7 @@ void SvtValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 ImplDrawItemText(rRenderContext, pItem->maText); } -void SvtValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, SvtValueSetItem* pItem, tools::Rectangle aRect) +void ValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSetItem* pItem, tools::Rectangle aRect) { WinBits nStyle = GetStyle(); if (nStyle & WB_ITEMBORDER) @@ -1403,7 +1403,7 @@ void SvtValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, SvtV } } -void SvtValueSet::ImplDrawItemText(vcl::RenderContext& rRenderContext, const OUString& rText) +void ValueSet::ImplDrawItemText(vcl::RenderContext& rRenderContext, const OUString& rText) { if (!(GetStyle() & WB_NAMEFIELD)) return; @@ -1430,18 +1430,18 @@ void SvtValueSet::ImplDrawItemText(vcl::RenderContext& rRenderContext, const OUS rRenderContext.DrawText(Point((aWinSize.Width() - nTxtWidth) / 2, nTxtOffset + (NAME_OFFSET / 2)), rText); } -void SvtValueSet::StyleUpdated() +void ValueSet::StyleUpdated() { mbFormat = true; CustomWidgetController::StyleUpdated(); } -void SvtValueSet::EnableFullItemMode( bool bFullMode ) +void ValueSet::EnableFullItemMode( bool bFullMode ) { mbFullMode = bFullMode; } -void SvtValueSet::SetColCount( sal_uInt16 nNewCols ) +void ValueSet::SetColCount( sal_uInt16 nNewCols ) { if ( mnUserCols != nNewCols ) { @@ -1453,14 +1453,14 @@ void SvtValueSet::SetColCount( sal_uInt16 nNewCols ) } } -void SvtValueSet::SetItemImage( sal_uInt16 nItemId, const Image& rImage ) +void ValueSet::SetItemImage( sal_uInt16 nItemId, const Image& rImage ) { size_t nPos = GetItemPos( nItemId ); if ( nPos == VALUESET_ITEM_NOTFOUND ) return; - SvtValueSetItem* pItem = mItemList[nPos].get(); + ValueSetItem* pItem = mItemList[nPos].get(); pItem->meType = VALUESETITEM_IMAGE; pItem->maImage = rImage; @@ -1473,14 +1473,14 @@ void SvtValueSet::SetItemImage( sal_uInt16 nItemId, const Image& rImage ) mbFormat = true; } -void SvtValueSet::SetItemColor( sal_uInt16 nItemId, const Color& rColor ) +void ValueSet::SetItemColor( sal_uInt16 nItemId, const Color& rColor ) { size_t nPos = GetItemPos( nItemId ); if ( nPos == VALUESET_ITEM_NOTFOUND ) return; - SvtValueSetItem* pItem = mItemList[nPos].get(); + ValueSetItem* pItem = mItemList[nPos].get(); pItem->meType = VALUESETITEM_COLOR; pItem->maColor = rColor; @@ -1493,7 +1493,7 @@ void SvtValueSet::SetItemColor( sal_uInt16 nItemId, const Color& rColor ) mbFormat = true; } -Color SvtValueSet::GetItemColor( sal_uInt16 nItemId ) const +Color ValueSet::GetItemColor( sal_uInt16 nItemId ) const { size_t nPos = GetItemPos( nItemId ); @@ -1503,7 +1503,7 @@ Color SvtValueSet::GetItemColor( sal_uInt16 nItemId ) const return Color(); } -Size SvtValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCols, +Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCols, sal_uInt16 nDesireLines ) const { size_t nCalcCols = nDesireCols; @@ -1574,20 +1574,20 @@ Size SvtValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesire return aSize; } -void SvtValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage ) +void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage ) { - std::unique_ptr<SvtValueSetItem> pItem(new SvtValueSetItem( *this )); + std::unique_ptr<ValueSetItem> pItem(new ValueSetItem( *this )); pItem->mnId = nItemId; pItem->meType = VALUESETITEM_IMAGE; pItem->maImage = rImage; ImplInsertItem( std::move(pItem), VALUESET_APPEND ); } -void SvtValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, +void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, const OUString& rText, size_t nPos, bool bShowLegend ) { - std::unique_ptr<SvtValueSetItem> pItem(new SvtValueSetItem( *this )); + std::unique_ptr<ValueSetItem> pItem(new ValueSetItem( *this )); pItem->mnId = nItemId; pItem->meType = bShowLegend ? VALUESETITEM_IMAGE_AND_TEXT : VALUESETITEM_IMAGE; pItem->maImage = rImage; @@ -1595,18 +1595,18 @@ void SvtValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, ImplInsertItem( std::move(pItem), nPos ); } -void SvtValueSet::InsertItem( sal_uInt16 nItemId, size_t nPos ) +void ValueSet::InsertItem( sal_uInt16 nItemId, size_t nPos ) { - std::unique_ptr<SvtValueSetItem> pItem(new SvtValueSetItem( *this )); + std::unique_ptr<ValueSetItem> pItem(new ValueSetItem( *this )); pItem->mnId = nItemId; pItem->meType = VALUESETITEM_USERDRAW; ImplInsertItem( std::move(pItem), nPos ); } -void SvtValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, +void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, const OUString& rText ) { - std::unique_ptr<SvtValueSetItem> pItem(new SvtValueSetItem( *this )); + std::unique_ptr<ValueSetItem> pItem(new ValueSetItem( *this )); pItem->mnId = nItemId; pItem->meType = VALUESETITEM_COLOR; pItem->maColor = rColor; @@ -1614,7 +1614,7 @@ void SvtValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, ImplInsertItem( std::move(pItem), VALUESET_APPEND ); } -void SvtValueSet::ImplInsertItem( std::unique_ptr<SvtValueSetItem> pItem, const size_t nPos ) +void ValueSet::ImplInsertItem( std::unique_ptr<ValueSetItem> pItem, const size_t nPos ) { DBG_ASSERT( pItem->mnId, "ValueSet::InsertItem(): ItemId == 0" ); DBG_ASSERT( GetItemPos( pItem->mnId ) == VALUESET_ITEM_NOTFOUND, @@ -1633,14 +1633,14 @@ void SvtValueSet::ImplInsertItem( std::unique_ptr<SvtValueSetItem> pItem, const Invalidate(); } -int SvtValueSet::GetScrollWidth() const +int ValueSet::GetScrollWidth() const { if (mxScrolledWindow) return mxScrolledWindow->get_vscroll_width(); return 0; } -void SvtValueSet::SetEdgeBlending(bool bNew) +void ValueSet::SetEdgeBlending(bool bNew) { if(mbEdgeBlending != bNew) { @@ -1654,7 +1654,7 @@ void SvtValueSet::SetEdgeBlending(bool bNew) } } -Size SvtValueSet::CalcItemSizePixel( const Size& rItemSize) const +Size ValueSet::CalcItemSizePixel( const Size& rItemSize) const { Size aSize = rItemSize; @@ -1675,7 +1675,7 @@ Size SvtValueSet::CalcItemSizePixel( const Size& rItemSize) const return aSize; } -void SvtValueSet::SetLineCount( sal_uInt16 nNewLines ) +void ValueSet::SetLineCount( sal_uInt16 nNewLines ) { if ( mnUserVisLines != nNewLines ) { @@ -1687,7 +1687,7 @@ void SvtValueSet::SetLineCount( sal_uInt16 nNewLines ) } } -void SvtValueSet::SetItemWidth( long nNewItemWidth ) +void ValueSet::SetItemWidth( long nNewItemWidth ) { if ( mnUserItemWidth != nNewItemWidth ) { @@ -1700,19 +1700,19 @@ void SvtValueSet::SetItemWidth( long nNewItemWidth ) } //method to set accessible when the style is user draw. -void SvtValueSet::InsertItem( sal_uInt16 nItemId, const OUString& rText, size_t nPos ) +void ValueSet::InsertItem( sal_uInt16 nItemId, const OUString& rText, size_t nPos ) { DBG_ASSERT( nItemId, "ValueSet::InsertItem(): ItemId == 0" ); DBG_ASSERT( GetItemPos( nItemId ) == VALUESET_ITEM_NOTFOUND, "ValueSet::InsertItem(): ItemId already exists" ); - std::unique_ptr<SvtValueSetItem> pItem(new SvtValueSetItem( *this )); + std::unique_ptr<ValueSetItem> pItem(new ValueSetItem( *this )); pItem->mnId = nItemId; pItem->meType = VALUESETITEM_USERDRAW; pItem->maText = rText; ImplInsertItem( std::move(pItem), nPos ); } -void SvtValueSet::SetItemHeight( long nNewItemHeight ) +void ValueSet::SetItemHeight( long nNewItemHeight ) { if ( mnUserItemHeight != nNewItemHeight ) { @@ -1724,7 +1724,7 @@ void SvtValueSet::SetItemHeight( long nNewItemHeight ) } } -OUString SvtValueSet::RequestHelp(tools::Rectangle& rHelpRect) +OUString ValueSet::RequestHelp(tools::Rectangle& rHelpRect) { Point aPos = rHelpRect.TopLeft(); const size_t nItemPos = ImplGetItem( aPos ); @@ -1737,7 +1737,7 @@ OUString SvtValueSet::RequestHelp(tools::Rectangle& rHelpRect) return sRet; } -OUString SvtValueSet::GetItemText(sal_uInt16 nItemId) const +OUString ValueSet::GetItemText(sal_uInt16 nItemId) const { const size_t nPos = GetItemPos(nItemId); @@ -1747,7 +1747,7 @@ OUString SvtValueSet::GetItemText(sal_uInt16 nItemId) const return OUString(); } -void SvtValueSet::SetExtraSpacing( sal_uInt16 nNewSpacing ) +void ValueSet::SetExtraSpacing( sal_uInt16 nNewSpacing ) { if ( GetStyle() & WB_ITEMBORDER ) { @@ -1760,19 +1760,19 @@ void SvtValueSet::SetExtraSpacing( sal_uInt16 nNewSpacing ) } } -void SvtValueSet::SetFormat() +void ValueSet::SetFormat() { mbFormat = true; } -void SvtValueSet::SetItemData( sal_uInt16 nItemId, void* pData ) +void ValueSet::SetItemData( sal_uInt16 nItemId, void* pData ) { size_t nPos = GetItemPos( nItemId ); if ( nPos == VALUESET_ITEM_NOTFOUND ) return; - SvtValueSetItem* pItem = mItemList[nPos].get(); + ValueSetItem* pItem = mItemList[nPos].get(); pItem->mpData = pData; if ( pItem->meType == VALUESETITEM_USERDRAW ) @@ -1787,7 +1787,7 @@ void SvtValueSet::SetItemData( sal_uInt16 nItemId, void* pData ) } } -void* SvtValueSet::GetItemData( sal_uInt16 nItemId ) const +void* ValueSet::GetItemData( sal_uInt16 nItemId ) const { size_t nPos = GetItemPos( nItemId ); @@ -1797,14 +1797,14 @@ void* SvtValueSet::GetItemData( sal_uInt16 nItemId ) const return nullptr; } -void SvtValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText) +void ValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText) { size_t nPos = GetItemPos( nItemId ); if ( nPos == VALUESET_ITEM_NOTFOUND ) return; - SvtValueSetItem* pItem = mItemList[nPos].get(); + ValueSetItem* pItem = mItemList[nPos].get(); // Remember old and new name for accessibility event. Any aOldName; @@ -1830,16 +1830,16 @@ void SvtValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText) if (ImplHasAccessibleListeners()) { Reference<XAccessible> xAccessible(pItem->GetAccessible( false/*bIsTransientChildrenDisabled*/)); - SvtValueItemAcc* pValueItemAcc = static_cast<SvtValueItemAcc*>(xAccessible.get()); + ValueItemAcc* pValueItemAcc = static_cast<ValueItemAcc*>(xAccessible.get()); pValueItemAcc->FireAccessibleEvent(AccessibleEventId::NAME_CHANGED, aOldName, aNewName); } } -Size SvtValueSet::GetLargestItemSize() +Size ValueSet::GetLargestItemSize() { Size aLargestItem; - for (const std::unique_ptr<SvtValueSetItem>& pItem : mItemList) + for (const std::unique_ptr<ValueSetItem>& pItem : mItemList) { if (!pItem->mbVisible) continue; @@ -1867,7 +1867,7 @@ Size SvtValueSet::GetLargestItemSize() return aLargestItem; } -void SvtValueSet::SetOptimalSize() +void ValueSet::SetOptimalSize() { Size aLargestSize(GetLargestItemSize()); aLargestSize.setWidth(std::max(aLargestSize.Width(), mnUserItemWidth)); @@ -1876,7 +1876,7 @@ void SvtValueSet::SetOptimalSize() GetDrawingArea()->set_size_request(aPrefSize.Width(), aPrefSize.Height()); } -Image SvtValueSet::GetItemImage(sal_uInt16 nItemId) const +Image ValueSet::GetItemImage(sal_uInt16 nItemId) const { size_t nPos = GetItemPos( nItemId ); @@ -1886,7 +1886,7 @@ Image SvtValueSet::GetItemImage(sal_uInt16 nItemId) const return Image(); } -void SvtValueSet::SetColor(const Color& rColor) +void ValueSet::SetColor(const Color& rColor) { maColor = rColor; mbFormat = true; @@ -1894,14 +1894,14 @@ void SvtValueSet::SetColor(const Color& rColor) Invalidate(); } -void SvtValueSet::Show() +void ValueSet::Show() { if (mxScrolledWindow) mxScrolledWindow->show(); CustomWidgetController::Show(); } -void SvtValueSet::Hide() +void ValueSet::Hide() { CustomWidgetController::Hide(); if (mxScrolledWindow) diff --git a/svx/inc/colrctrl.hxx b/svx/inc/colrctrl.hxx index 7f3ad6f9af29..4b369cf886fa 100644 --- a/svx/inc/colrctrl.hxx +++ b/svx/inc/colrctrl.hxx @@ -79,7 +79,7 @@ private: void FillValueSet(); - DECL_LINK(SelectHdl, SvtValueSet*, void); + DECL_LINK(SelectHdl, ValueSet*, void); /** This function is called when the window gets the focus. It grabs the focus to the color value set so that it can be controlled with diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 7d72594a0de1..4c6ce49ed5f1 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -106,7 +106,7 @@ private: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; DECL_LINK( SelectObjectHdl, weld::TreeView&, void ); - DECL_LINK( SelectObjectValueSetHdl, SvtValueSet*, void ); + DECL_LINK( SelectObjectValueSetHdl, ValueSet*, void ); DECL_LINK( SelectTbxHdl, weld::ToggleButton&, void ); DECL_LINK( PopupMenuHdl, const CommandEvent&, bool ); DECL_LINK( KeyInputHdl, const KeyEvent&, bool ); diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index c5d2321b5519..8d0c4dfc028a 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -240,7 +240,7 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() { css::uno::Reference<css::accessibility::XAccessibleContext> xParentContext(xParent->getAccessibleContext()); css::uno::Reference<css::accessibility::XAccessibleComponent> xParentComponent(xParentContext, css::uno::UNO_QUERY); - OSL_ENSURE( xParentComponent.is(), "SvtValueSetAcc::getLocationOnScreen: no parent component!" ); + OSL_ENSURE( xParentComponent.is(), "ValueSetAcc::getLocationOnScreen: no parent component!" ); if ( xParentComponent.is() ) { awt::Point aParentScreenLoc( xParentComponent->getLocationOnScreen() ); diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 90fc38673185..05957ba376c3 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -80,7 +80,7 @@ public: } }; -class MaskSet : public SvtValueSet +class MaskSet : public ValueSet { VclPtr<SvxBmpMask> pSvxBmpMask; @@ -92,7 +92,7 @@ public: virtual void SetDrawingArea(weld::DrawingArea* pArea) override { Size aSize(pArea->get_ref_device().LogicToPixel(Size(24, 12), MapMode(MapUnit::MapAppFont))); - SvtValueSet::SetDrawingArea(pArea); + ValueSet::SetDrawingArea(pArea); pArea->set_size_request(aSize.Width(), aSize.Height()); SetOutputSizePixel(aSize); SetHelpId(HID_BMPMASK_CTL_QCOL_1); @@ -101,21 +101,21 @@ public: }; MaskSet::MaskSet(SvxBmpMask* pMask) - : SvtValueSet(nullptr) + : ValueSet(nullptr) , pSvxBmpMask(pMask) { } void MaskSet::Select() { - SvtValueSet::Select(); + ValueSet::Select(); pSvxBmpMask->onSelect( this ); } void MaskSet::GetFocus() { - SvtValueSet::GetFocus(); + ValueSet::GetFocus(); SelectItem( 1 ); pSvxBmpMask->onSelect( this ); } @@ -129,7 +129,7 @@ bool MaskSet::KeyInput( const KeyEvent& rKEvt ) // if the key has a modifier we don't care if( aCode.GetModifier() ) { - bRet = SvtValueSet::KeyInput( rKEvt ); + bRet = ValueSet::KeyInput( rKEvt ); } else { @@ -141,7 +141,7 @@ bool MaskSet::KeyInput( const KeyEvent& rKEvt ) bRet = true; break; default: - bRet = SvtValueSet::KeyInput( rKEvt ); + bRet = ValueSet::KeyInput( rKEvt ); } } return bRet; diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index f40c70fba991..6ca545e9973d 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -392,7 +392,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } SvxNumValueSet::SvxNumValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow) - : SvtValueSet(std::move(pScrolledWindow)) + : ValueSet(std::move(pScrolledWindow)) , ePageType(NumberingPageType::BULLET) , pVDev(nullptr) { diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 7a7179bd9c03..7cb1f32d37a9 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -1227,7 +1227,7 @@ OUString GalleryBrowser2::GetFilterName() const return aFilterName; } -IMPL_LINK_NOARG(GalleryBrowser2, SelectObjectValueSetHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(GalleryBrowser2, SelectObjectValueSetHdl, ValueSet*, void) { ImplUpdateSelection(); } diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index c216d611d7d8..6604eee1e662 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -283,7 +283,7 @@ void GalleryIconView::drawTransparenceBackground(vcl::RenderContext& rOut, const } GalleryIconView::GalleryIconView(GalleryBrowser2* pParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow) - : SvtValueSet(std::move(xScrolledWindow)) + : ValueSet(std::move(xScrolledWindow)) , mpParent(pParent) , mpTheme(nullptr) { @@ -295,7 +295,7 @@ GalleryIconView::~GalleryIconView() void GalleryIconView::SetDrawingArea(weld::DrawingArea* pDrawingArea) { - SvtValueSet::SetDrawingArea(pDrawingArea); + ValueSet::SetDrawingArea(pDrawingArea); SetStyle(GetStyle() | WB_TABSTOP | WB_3DLOOK | WB_BORDER | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_VSCROLL | WB_FLATVALUESET); EnableFullItemMode( false ); @@ -371,7 +371,7 @@ void GalleryIconView::UserDraw(const UserDrawEvent& rUDEvt) bool GalleryIconView::MouseButtonDown(const MouseEvent& rMEvt) { - bool bRet = SvtValueSet::MouseButtonDown(rMEvt); + bool bRet = ValueSet::MouseButtonDown(rMEvt); if (rMEvt.GetClicks() == 2) mpParent->TogglePreview(); @@ -381,7 +381,7 @@ bool GalleryIconView::MouseButtonDown(const MouseEvent& rMEvt) bool GalleryIconView::Command(const CommandEvent& rCEvt) { - bool bRet = SvtValueSet::Command(rCEvt); + bool bRet = ValueSet::Command(rCEvt); if (rCEvt.GetCommand() == CommandEventId::ContextMenu) { @@ -394,7 +394,7 @@ bool GalleryIconView::Command(const CommandEvent& rCEvt) bool GalleryIconView::KeyInput(const KeyEvent& rKEvt) { if (!mpTheme || !mpParent->KeyInput(rKEvt)) - return SvtValueSet::KeyInput(rKEvt); + return ValueSet::KeyInput(rKEvt); return true; } diff --git a/svx/source/inc/DefaultShapesPanel.hxx b/svx/source/inc/DefaultShapesPanel.hxx index 1b3f036dabcb..9e888fe4e0cd 100644 --- a/svx/source/inc/DefaultShapesPanel.hxx +++ b/svx/source/inc/DefaultShapesPanel.hxx @@ -47,33 +47,33 @@ public: virtual void dispose() override; private: - std::unique_ptr<SvtValueSet> mxLineArrowSet; + std::unique_ptr<ValueSet> mxLineArrowSet; std::unique_ptr<weld::CustomWeld> mxLineArrowSetWin; - std::unique_ptr<SvtValueSet> mxCurveSet; + std::unique_ptr<ValueSet> mxCurveSet; std::unique_ptr<weld::CustomWeld> mxCurveSetWin; - std::unique_ptr<SvtValueSet> mxConnectorSet; + std::unique_ptr<ValueSet> mxConnectorSet; std::unique_ptr<weld::CustomWeld> mxConnectorSetWin; - std::unique_ptr<SvtValueSet> mxBasicShapeSet; + std::unique_ptr<ValueSet> mxBasicShapeSet; std::unique_ptr<weld::CustomWeld> mxBasicShapeSetWin; - std::unique_ptr<SvtValueSet> mxSymbolShapeSet; + std::unique_ptr<ValueSet> mxSymbolShapeSet; std::unique_ptr<weld::CustomWeld> mxSymbolShapeSetWin; - std::unique_ptr<SvtValueSet> mxBlockArrowSet; + std::unique_ptr<ValueSet> mxBlockArrowSet; std::unique_ptr<weld::CustomWeld> mxBlockArrowSetWin; - std::unique_ptr<SvtValueSet> mxFlowchartSet; + std::unique_ptr<ValueSet> mxFlowchartSet; std::unique_ptr<weld::CustomWeld> mxFlowchartSetWin; - std::unique_ptr<SvtValueSet> mxCalloutSet; + std::unique_ptr<ValueSet> mxCalloutSet; std::unique_ptr<weld::CustomWeld> mxCalloutSetWin; - std::unique_ptr<SvtValueSet> mxStarSet; + std::unique_ptr<ValueSet> mxStarSet; std::unique_ptr<weld::CustomWeld> mxStarSetWin; - std::unique_ptr<SvtValueSet> mx3DObjectSet; + std::unique_ptr<ValueSet> mx3DObjectSet; std::unique_ptr<weld::CustomWeld> mx3DObjectSetWin; Reference< XFrame > mxFrame; - std::map<SvtValueSet*, std::map<sal_uInt16, OUString>> mpShapesSetMap; + std::map<ValueSet*, std::map<sal_uInt16, OUString>> mpShapesSetMap; void populateShapes(); void Initialize(); - DECL_LINK( ShapeSelectHdl, SvtValueSet*, void ); + DECL_LINK( ShapeSelectHdl, ValueSet*, void ); }; } } // end of namespace sd::sidebar diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index d2782d761d2f..c65afbe639be 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -97,7 +97,7 @@ LineWidthPopup::~LineWidthPopup() { } -IMPL_LINK_NOARG(LineWidthPopup, VSSelectHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(LineWidthPopup, VSSelectHdl, ValueSet*, void) { sal_uInt16 iPos = m_xVSWidth->GetSelectedItemId(); if (iPos >= 1 && iPos <= 8) diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index df4afd8fdef7..e78fd51ae3f7 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -26,7 +26,7 @@ namespace svx::sidebar { LineWidthValueSet::LineWidthValueSet() - : SvtValueSet(nullptr) + : ValueSet(nullptr) , nSelItem(0) , bCusEnable(false) { @@ -36,7 +36,7 @@ void LineWidthValueSet::Resize() { SetColCount(); SetLineCount(9); - SvtValueSet::Resize(); + ValueSet::Resize(); } LineWidthValueSet::~LineWidthValueSet() @@ -161,7 +161,7 @@ void LineWidthValueSet::UserDraw( const UserDrawEvent& rUDEvt ) void LineWidthValueSet::SetDrawingArea(weld::DrawingArea* pDrawingArea) { - SvtValueSet::SetDrawingArea(pDrawingArea); + ValueSet::SetDrawingArea(pDrawingArea); Size aSize(pDrawingArea->get_ref_device().LogicToPixel(Size(80, 12 * 9), MapMode(MapUnit::MapAppFont))); pDrawingArea->set_size_request(aSize.Width(), aSize.Height()); SetOutputSizePixel(aSize); diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx index 67998ce204c5..91000ba5b794 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.hxx +++ b/svx/source/sidebar/line/LineWidthValueSet.hxx @@ -25,7 +25,7 @@ namespace svx { namespace sidebar { -class LineWidthValueSet final : public SvtValueSet +class LineWidthValueSet final : public ValueSet { public: explicit LineWidthValueSet(); diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx index 33704bf90f30..9295d9b5ade4 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx @@ -30,25 +30,25 @@ DefaultShapesPanel::DefaultShapesPanel ( const css::uno::Reference<css::frame::XFrame>& rxFrame) : PanelLayout(pParent, "DefaultShapesPanel", "svx/ui/defaultshapespanel.ui", rxFrame) , SvxShapeCommandsMap() - , mxLineArrowSet(new SvtValueSet(nullptr)) + , mxLineArrowSet(new ValueSet(nullptr)) , mxLineArrowSetWin(new weld::CustomWeld(*m_xBuilder, "LinesArrows", *mxLineArrowSet)) - , mxCurveSet(new SvtValueSet(nullptr)) + , mxCurveSet(new ValueSet(nullptr)) , mxCurveSetWin(new weld::CustomWeld(*m_xBuilder, "Curves", *mxCurveSet)) - , mxConnectorSet(new SvtValueSet(nullptr)) + , mxConnectorSet(new ValueSet(nullptr)) , mxConnectorSetWin(new weld::CustomWeld(*m_xBuilder, "Connectors", *mxConnectorSet)) - , mxBasicShapeSet(new SvtValueSet(nullptr)) + , mxBasicShapeSet(new ValueSet(nullptr)) , mxBasicShapeSetWin(new weld::CustomWeld(*m_xBuilder, "BasicShapes", *mxBasicShapeSet)) - , mxSymbolShapeSet(new SvtValueSet(nullptr)) + , mxSymbolShapeSet(new ValueSet(nullptr)) , mxSymbolShapeSetWin(new weld::CustomWeld(*m_xBuilder, "SymbolShapes", *mxSymbolShapeSet)) - , mxBlockArrowSet(new SvtValueSet(nullptr)) + , mxBlockArrowSet(new ValueSet(nullptr)) , mxBlockArrowSetWin(new weld::CustomWeld(*m_xBuilder, "BlockArrows", *mxBlockArrowSet)) - , mxFlowchartSet(new SvtValueSet(nullptr)) + , mxFlowchartSet(new ValueSet(nullptr)) , mxFlowchartSetWin(new weld::CustomWeld(*m_xBuilder, "Flowcharts", *mxFlowchartSet)) - , mxCalloutSet(new SvtValueSet(nullptr)) + , mxCalloutSet(new ValueSet(nullptr)) , mxCalloutSetWin(new weld::CustomWeld(*m_xBuilder, "Callouts", *mxCalloutSet)) - , mxStarSet(new SvtValueSet(nullptr)) + , mxStarSet(new ValueSet(nullptr)) , mxStarSetWin(new weld::CustomWeld(*m_xBuilder, "Stars", *mxStarSet)) - , mx3DObjectSet(new SvtValueSet(nullptr)) + , mx3DObjectSet(new ValueSet(nullptr)) , mx3DObjectSetWin(new weld::CustomWeld(*m_xBuilder, "3DObjects", *mx3DObjectSet)) , mxFrame(rxFrame) { @@ -122,7 +122,7 @@ void DefaultShapesPanel::dispose() PanelLayout::dispose(); } -IMPL_LINK(DefaultShapesPanel, ShapeSelectHdl, SvtValueSet*, rValueSet, void) +IMPL_LINK(DefaultShapesPanel, ShapeSelectHdl, ValueSet*, rValueSet, void) { for(auto& aSetMap : mpShapesSetMap) { diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 026bf581a9d4..962102ac59d0 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -28,13 +28,13 @@ namespace svx::sidebar { ValueSetWithTextControl::ValueSetWithTextControl() - : SvtValueSet(nullptr) + : ValueSet(nullptr) { } void ValueSetWithTextControl::SetDrawingArea(weld::DrawingArea* pDrawingArea) { - SvtValueSet::SetDrawingArea(pDrawingArea); + ValueSet::SetDrawingArea(pDrawingArea); Size aSize(250, 300); pDrawingArea->set_size_request(aSize.Width(), aSize.Height()); diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index 25ed247f8239..c9423cb84e5f 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -24,7 +24,7 @@ #include <osl/diagnose.h> SvxColorValueSet::SvxColorValueSet(std::unique_ptr<weld::ScrolledWindow> pWindow) - : SvtValueSet(std::move(pWindow)) + : ValueSet(std::move(pWindow)) { SetEdgeBlending(true); } @@ -119,7 +119,7 @@ Size SvxColorValueSet::layoutAllVisible(sal_uInt32 nEntryCount) void SvxColorValueSet::Resize() { layoutToGivenHeight(GetOutputSizePixel().Height(), GetItemCount()); - SvtValueSet::Resize(); + ValueSet::Resize(); } Size SvxColorValueSet::layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount) diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx index 92b0e4233a6c..1b9aa8e8beed 100644 --- a/svx/source/tbxctrls/SvxPresetListBox.cxx +++ b/svx/source/tbxctrls/SvxPresetListBox.cxx @@ -24,7 +24,7 @@ #include <vcl/svapp.hxx> SvxPresetListBox::SvxPresetListBox(std::unique_ptr<weld::ScrolledWindow> pWindow) - : SvtValueSet(std::move(pWindow)) + : ValueSet(std::move(pWindow)) , aIconSize(60, 64) { SetEdgeBlending(true); @@ -37,7 +37,7 @@ void SvxPresetListBox::Resize() WinBits aWinBits(GetStyle()); aWinBits |= WB_VSCROLL; SetStyle(aWinBits); - SvtValueSet::Resize(); + ValueSet::Resize(); } bool SvxPresetListBox::Command(const CommandEvent& rEvent) diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index 423a56ee1d9c..430ca197457d 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -33,7 +33,7 @@ class NumberingPopup : public WeldToolbarPopup std::unique_ptr<SvxNumValueSet> mxValueSet; std::unique_ptr<weld::CustomWeld> mxValueSetWin; std::unique_ptr<weld::Button> mxMoreButton; - DECL_LINK(VSSelectValueSetHdl, SvtValueSet*, void); + DECL_LINK(VSSelectValueSetHdl, ValueSet*, void); DECL_LINK(VSButtonClickSetHdl, weld::Button&, void); virtual void GrabFocus() override; @@ -141,7 +141,7 @@ void NumberingPopup::statusChanged( const css::frame::FeatureStateEvent& rEvent mxValueSet->SelectItem( nSelItem ); } -IMPL_LINK_NOARG(NumberingPopup, VSSelectValueSetHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(NumberingPopup, VSSelectValueSetHdl, ValueSet*, void) { sal_uInt16 nSelItem = mxValueSet->GetSelectedItemId(); if ( mePageType == NumberingPageType::BULLET ) diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index a35e15e7d220..52b8f9c7b26b 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -281,7 +281,7 @@ bool SvxColorDockingWindow::Close() return true; } -IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl, ValueSet*, void) { SfxDispatcher* pDispatcher = GetBindings().GetDispatcher(); sal_uInt16 nPos = xColorSet->GetSelectedItemId(); diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index cdd5e1e34ae7..8f4e2fd5dc74 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -114,7 +114,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( weld::Widget* pParent) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/directionwindow.ui", "DirectionWindow") , mxControl(pControl) - , mxDirectionSet(new SvtValueSet(nullptr)) + , mxDirectionSet(new ValueSet(nullptr)) , mxDirectionSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxDirectionSet)) , mxPerspective(m_xBuilder->weld_radio_button("perspective")) , mxParallel(m_xBuilder->weld_radio_button("parallel")) @@ -219,7 +219,7 @@ void ExtrusionDirectionWindow::statusChanged( } } -IMPL_LINK_NOARG(ExtrusionDirectionWindow, SelectValueSetHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(ExtrusionDirectionWindow, SelectValueSetHdl, ValueSet*, void) { Sequence< PropertyValue > aArgs( 1 ); aArgs[0].Name = OUString(g_sExtrusionDirection).copy(5); @@ -569,7 +569,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::PopupWindowController* pCo weld::Widget* pParent) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/lightingwindow.ui", "LightingWindow") , mxControl(pControl) - , mxLightingSet(new SvtValueSet(nullptr)) + , mxLightingSet(new ValueSet(nullptr)) , mxLightingSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxLightingSet)) , mxBright(m_xBuilder->weld_radio_button("bright")) , mxNormal(m_xBuilder->weld_radio_button("normal")) @@ -694,7 +694,7 @@ void ExtrusionLightingWindow::statusChanged( } } -IMPL_LINK_NOARG(ExtrusionLightingWindow, SelectValueSetHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(ExtrusionLightingWindow, SelectValueSetHdl, ValueSet*, void) { sal_Int32 nDirection = mxLightingSet->GetSelectedItemId(); diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 12a61f6f4365..0a051e2c461d 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -58,7 +58,7 @@ public: private: rtl::Reference<svt::PopupWindowController> mxControl; - std::unique_ptr<SvtValueSet> mxDirectionSet; + std::unique_ptr<ValueSet> mxDirectionSet; std::unique_ptr<weld::CustomWeld> mxDirectionSetWin; std::unique_ptr<weld::RadioButton> mxPerspective; std::unique_ptr<weld::RadioButton> mxParallel; @@ -66,7 +66,7 @@ private: Image maImgDirection[9]; DECL_LINK( SelectToolbarMenuHdl, weld::Button&, void ); - DECL_LINK( SelectValueSetHdl, SvtValueSet*, void ); + DECL_LINK( SelectValueSetHdl, ValueSet*, void ); void implSetDirection( sal_Int32 nSkew, bool bEnabled ); void implSetProjection( sal_Int32 nProjection, bool bEnabled ); @@ -138,7 +138,7 @@ class ExtrusionLightingWindow final : public WeldToolbarPopup { private: rtl::Reference<svt::PopupWindowController> mxControl; - std::unique_ptr<SvtValueSet> mxLightingSet; + std::unique_ptr<ValueSet> mxLightingSet; std::unique_ptr<weld::CustomWeld> mxLightingSetWin; std::unique_ptr<weld::RadioButton> mxBright; std::unique_ptr<weld::RadioButton> mxNormal; @@ -152,7 +152,7 @@ private: void implSetDirection( int nDirection, bool bEnabled ); DECL_LINK( SelectToolbarMenuHdl, weld::Button&, void ); - DECL_LINK( SelectValueSetHdl, SvtValueSet*, void ); + DECL_LINK( SelectValueSetHdl, ValueSet*, void ); public: ExtrusionLightingWindow(svt::PopupWindowController* pControl, weld::Widget* pParentWindow); virtual void GrabFocus() override; diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 4268cec97316..1b2f1189b62f 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -244,7 +244,7 @@ IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl, ValueSet*, void) { insertSelectedFontwork(); m_xDialog->response(RET_OK); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index fbd2eab615df..df0115f5b91b 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -239,12 +239,12 @@ class SvxLineEndWindow final : public WeldToolbarPopup private: XLineEndListRef mpLineEndList; rtl::Reference<SvxLineEndToolBoxControl> mxControl; - std::unique_ptr<SvtValueSet> mxLineEndSet; + std::unique_ptr<ValueSet> mxLineEndSet; std::unique_ptr<weld::CustomWeld> mxLineEndSetWin; sal_uInt16 mnLines; Size maBmpSize; - DECL_LINK( SelectHdl, SvtValueSet*, void ); + DECL_LINK( SelectHdl, ValueSet*, void ); void FillValueSet(); void SetSize(); @@ -265,7 +265,7 @@ static constexpr sal_uInt16 gnCols = 2; SvxLineEndWindow::SvxLineEndWindow(SvxLineEndToolBoxControl* pControl, weld::Widget* pParent) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/floatinglineend.ui", "FloatingLineEnd") , mxControl(pControl) - , mxLineEndSet(new SvtValueSet(m_xBuilder->weld_scrolled_window("valuesetwin"))) + , mxLineEndSet(new ValueSet(m_xBuilder->weld_scrolled_window("valuesetwin"))) , mxLineEndSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxLineEndSet)) , mnLines(12) { @@ -291,7 +291,7 @@ SvxLineEndWindow::SvxLineEndWindow(SvxLineEndToolBoxControl* pControl, weld::Wid AddStatusListener( ".uno:LineEndListState"); } -IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl, ValueSet*, void) { std::unique_ptr<XLineEndItem> pLineEndItem; std::unique_ptr<XLineStartItem> pLineStartItem; @@ -503,7 +503,7 @@ com_sun_star_comp_svx_LineEndToolBoxControl_get_implementation( SvxLineBox::SvxLineBox(SvxLineStyleToolBoxControl* pControl, weld::Widget* pParent, int nInitialIndex) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/floatinglinestyle.ui", "FloatingLineStyle") , mxControl(pControl) - , mxLineStyleSet(new SvtValueSet(m_xBuilder->weld_scrolled_window("valuesetwin"))) + , mxLineStyleSet(new ValueSet(m_xBuilder->weld_scrolled_window("valuesetwin"))) , mxLineStyleSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxLineStyleSet)) { mxLineStyleSet->SetStyle(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT); @@ -569,7 +569,7 @@ void SvxLineBox::Fill( const XDashListRef &pList ) mxLineStyleSet->SetOutputSizePixel(aSize); } -IMPL_LINK_NOARG(SvxLineBox, SelectHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxLineBox, SelectHdl, ValueSet*, void) { drawing::LineStyle eXLS; sal_Int32 nPos = mxLineStyleSet->GetSelectedItemId(); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 3e13b0bfcc7c..d3fa2d059ec2 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -410,7 +410,7 @@ public: // SelectHdl needs the Modifiers, get them in MouseButtonUp -class SvxFrmValueSet_Impl final : public SvtValueSet +class SvxFrmValueSet_Impl final : public ValueSet { private: sal_uInt16 nModifier; @@ -418,12 +418,12 @@ private: virtual bool MouseButtonUp(const MouseEvent& rMEvt) override { nModifier = rMEvt.GetModifier(); - return SvtValueSet::MouseButtonUp(rMEvt); + return ValueSet::MouseButtonUp(rMEvt); } public: SvxFrmValueSet_Impl() - : SvtValueSet(nullptr) + : ValueSet(nullptr) , nModifier(0) { } @@ -447,7 +447,7 @@ private: void InitImageList(); void CalcSizeValueSet(); - DECL_LINK( SelectHdl, SvtValueSet*, void ); + DECL_LINK( SelectHdl, ValueSet*, void ); public: SvxFrameWindow_Impl(SvxFrameToolBoxControl* pControl, weld::Widget* pParent); @@ -477,7 +477,7 @@ private: virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; }; - class LineListBox final : public SvtValueSet + class LineListBox final : public ValueSet { public: typedef Color (*ColorFunc)(Color); @@ -621,7 +621,7 @@ private: } LineListBox::LineListBox() - : SvtValueSet(nullptr) + : ValueSet(nullptr) , m_nWidth( 5 ) , m_sNone() , aVirDev(VclPtr<VirtualDevice>::Create()) @@ -635,7 +635,7 @@ private: void LineListBox::SetDrawingArea(weld::DrawingArea* pDrawingArea) { - SvtValueSet::SetDrawingArea(pDrawingArea); + ValueSet::SetDrawingArea(pDrawingArea); OutputDevice& rDevice = pDrawingArea->get_ref_device(); @@ -787,7 +787,7 @@ private: std::unique_ptr<weld::CustomWeld> m_xLineStyleLbWin; bool m_bIsWriter; - DECL_LINK( SelectHdl, SvtValueSet*, void ); + DECL_LINK( SelectHdl, ValueSet*, void ); public: SvxLineWindow_Impl(SvxFrameToolBoxControl* pControl, weld::Widget* pParent); @@ -1860,7 +1860,7 @@ ColorWindow::~ColorWindow() { } -NamedColor ColorWindow::GetSelectEntryColor(SvtValueSet const * pColorSet) +NamedColor ColorWindow::GetSelectEntryColor(ValueSet const * pColorSet) { Color aColor = pColorSet->GetItemColor(pColorSet->GetSelectedItemId()); OUString sColorName = pColorSet->GetItemText(pColorSet->GetSelectedItemId()); @@ -1924,7 +1924,7 @@ NamedColor ColorWindow::GetSelectEntryColor() const return GetAutoColor(); } -IMPL_LINK(ColorWindow, SelectHdl, SvtValueSet*, pColorSet, void) +IMPL_LINK(ColorWindow, SelectHdl, ValueSet*, pColorSet, void) { NamedColor aNamedColor = GetSelectEntryColor(pColorSet); @@ -2196,7 +2196,7 @@ namespace o3tl { // By default unset lines remain unchanged. // Via Shift unset lines are reset -IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void) { SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER ); SvxBoxInfoItem aBorderInner( SID_ATTR_BORDER_INNER ); @@ -2436,7 +2436,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl(SvxFrameToolBoxControl* pControl, weld::W m_xLineStyleLb->SetOutputSizePixel(aSize); } -IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl, ValueSet*, void) { SvxLineItem aLineItem( SID_FRAME_LINESTYLE ); SvxBorderLineStyle nStyle = m_xLineStyleLb->GetSelectEntryStyle(); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 05aa0ab855d7..50822c644e6b 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -1262,7 +1262,7 @@ DeactivateRC SwColumnPage::DeactivatePage(SfxItemSet *_pSet) return DeactivateRC::LeavePage; } -IMPL_LINK(SwColumnPage, SetDefaultsHdl, SvtValueSet *, pVS, void) +IMPL_LINK(SwColumnPage, SetDefaultsHdl, ValueSet *, pVS, void) { const sal_uInt16 nItem = pVS->GetSelectedItemId(); if( nItem < 4 ) @@ -1381,7 +1381,7 @@ void ColumnValueSet::StyleUpdated() { SetFormat(); Invalidate(); - SvtValueSet::StyleUpdated(); + ValueSet::StyleUpdated(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index c2f05d96fec6..1b799c1c2c90 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -65,16 +65,16 @@ public: virtual ~SwColumnDlg() override; }; -class ColumnValueSet : public SvtValueSet +class ColumnValueSet : public ValueSet { public: ColumnValueSet() - : SvtValueSet(nullptr) + : ValueSet(nullptr) { } virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override { - SvtValueSet::SetDrawingArea(pDrawingArea); + ValueSet::SetDrawingArea(pDrawingArea); SetStyle(WB_TABSTOP | WB_ITEMBORDER | WB_DOUBLEBORDER); } virtual void UserDraw(const UserDrawEvent& rUDEvt) override; @@ -142,7 +142,7 @@ class SwColumnPage : public SfxTabPage DECL_LINK(GapModify, weld::MetricSpinButton&, void); DECL_LINK(EdModify, weld::MetricSpinButton&, void); DECL_LINK(AutoWidthHdl, weld::ToggleButton&, void ); - DECL_LINK(SetDefaultsHdl, SvtValueSet *, void); + DECL_LINK(SetDefaultsHdl, ValueSet *, void); DECL_LINK(Up, weld::Button&, void); DECL_LINK(Down, weld::Button&, void); diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index afb077d612b4..5abdb4788609 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -216,7 +216,7 @@ void PageSizeControl::ExecuteSizeChange( const Paper ePaper ) } -IMPL_LINK_NOARG(PageSizeControl, ImplSizeHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(PageSizeControl, ImplSizeHdl, ValueSet*, void) { mxSizeValueSet->SetNoSelection(); const sal_uInt16 nSelectedPaper = mxSizeValueSet->GetSelectedItemId(); diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index fe9fea33a3cf..1d627614630e 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -31,7 +31,7 @@ namespace svx { namespace sidebar { } } class PageSizePopup; -class SvtValueSet; +class ValueSet; namespace sw { namespace sidebar { @@ -54,7 +54,7 @@ private: static void ExecuteSizeChange( const Paper ePaper ); - DECL_LINK(ImplSizeHdl, SvtValueSet*, void); + DECL_LINK(ImplSizeHdl, ValueSet*, void); DECL_LINK(MoreButtonClickHdl_Impl, weld::Button&, void); }; diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index e91aebecde39..4d82afe29349 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -144,7 +144,7 @@ VclPtr<vcl::Window> StylePresetsPanel::Create (vcl::Window* pParent, StylePresetsPanel::StylePresetsPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame) : PanelLayout(pParent, "StylePresetsPanel", "modules/swriter/ui/sidebarstylepresets.ui", rxFrame) - , mxValueSet(new SvtValueSet(nullptr)) + , mxValueSet(new ValueSet(nullptr)) , mxValueSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxValueSet)) { mxValueSet->SetColCount(2); @@ -191,7 +191,7 @@ void StylePresetsPanel::dispose() PanelLayout::dispose(); } -IMPL_LINK_NOARG(StylePresetsPanel, DoubleClickHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(StylePresetsPanel, DoubleClickHdl, ValueSet*, void) { sal_Int32 nItemId = mxValueSet->GetSelectedItemId(); TemplateEntry* pEntry = static_cast<TemplateEntry*>(mxValueSet->GetItemData(nItemId)); diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx index 48a953cfa7b4..6f01b44e2f0d 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx @@ -56,12 +56,12 @@ private: virtual ~StylePresetsPanel() override; virtual void dispose() override; - std::unique_ptr<SvtValueSet> mxValueSet; + std::unique_ptr<ValueSet> mxValueSet; std::unique_ptr<weld::CustomWeld> mxValueSetWin; std::vector<std::unique_ptr<TemplateEntry>> maTemplateEntries; - DECL_LINK(DoubleClickHdl, SvtValueSet*, void); + DECL_LINK(DoubleClickHdl, ValueSet*, void); }; }} // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index 69863ba84df8..de8745944abb 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -416,7 +416,7 @@ ThemePanel::ThemePanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame) : PanelLayout(pParent, "ThemePanel", "modules/swriter/ui/sidebartheme.ui", rxFrame) , mxListBoxFonts(m_xBuilder->weld_tree_view("listbox_fonts")) - , mxValueSetColors(new SvtValueSet(nullptr)) + , mxValueSetColors(new ValueSet(nullptr)) , mxValueSetColorsWin(new weld::CustomWeld(*m_xBuilder, "valueset_colors", *mxValueSetColors)) , mxApplyButton(m_xBuilder->weld_button("apply")) , maColorSets() @@ -470,7 +470,7 @@ IMPL_LINK_NOARG(ThemePanel, ClickHdl, weld::Button&, void) DoubleClickHdl(); } -IMPL_LINK_NOARG(ThemePanel, DoubleClickValueSetHdl, SvtValueSet*, void) +IMPL_LINK_NOARG(ThemePanel, DoubleClickValueSetHdl, ValueSet*, void) { DoubleClickHdl(); } diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx index f3e58ab3f0f2..a00e592ecfcc 100644 --- a/sw/source/uibase/sidebar/ThemePanel.hxx +++ b/sw/source/uibase/sidebar/ThemePanel.hxx @@ -43,7 +43,7 @@ private: virtual void dispose() override; std::unique_ptr<weld::TreeView> mxListBoxFonts; - std::unique_ptr<SvtValueSet> mxValueSetColors; + std::unique_ptr<ValueSet> mxValueSetColors; std::unique_ptr<weld::CustomWeld> mxValueSetColorsWin; std::unique_ptr<weld::Button> mxApplyButton; @@ -51,7 +51,7 @@ private: DECL_LINK(ClickHdl, weld::Button&, void); DECL_LINK(DoubleClickHdl, weld::TreeView&, bool); - DECL_LINK(DoubleClickValueSetHdl, SvtValueSet*, void); + DECL_LINK(DoubleClickValueSetHdl, ValueSet*, void); void DoubleClickHdl(); }; |