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>

16 files changed, 44 insertions, 44 deletions

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: