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>

22 files changed, 81 insertions, 81 deletions

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