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>

19 files changed, 53 insertions, 53 deletions

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();