rename ColorValueSet back to SvxColorValueSet

Change-Id: I2036a8986d2d53fc97f1c7724e4e0ab837edc1ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92900
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 8 insertions, 8 deletions

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index d046a50b7ff6..9ccac256260c 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -648,8 +648,8 @@ private:
     PaletteManager maPaletteManager;
     SvxXRectPreview m_aCtlPreviewOld;
     SvxXRectPreview m_aCtlPreviewNew;
-    std::unique_ptr<ColorValueSet> m_xValSetColorList;
-    std::unique_ptr<ColorValueSet> m_xValSetRecentList;
+    std::unique_ptr<SvxColorValueSet> m_xValSetColorList;
+    std::unique_ptr<SvxColorValueSet> m_xValSetRecentList;
     std::unique_ptr<weld::ComboBox> m_xSelectPalette;
     std::unique_ptr<weld::RadioButton> m_xRbRGB;
     std::unique_ptr<weld::RadioButton> m_xRbCMYK;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 4ca091bb6c45..3d86942adce5 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -95,7 +95,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage(weld::Container* pPage, weld::Dia
     , m_xPBDefault(m_xBuilder->weld_button("default"))
     , m_xPBAdd(m_xBuilder->weld_button("add"))
     , m_xPBRemove(m_xBuilder->weld_button("delete"))
-    , m_xValSetColorBox(new ColorValueSet(m_xBuilder->weld_scrolled_window("tablewin")))
+    , m_xValSetColorBox(new SvxColorValueSet(m_xBuilder->weld_scrolled_window("tablewin")))
     , m_xValSetColorBoxWin(new weld::CustomWeld(*m_xBuilder, "table", *m_xValSetColorBox))
 {
     m_xLbChartColors->set_size_request(-1, m_xLbChartColors->get_height_rows(16));
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index f8b0dcb8f1f4..807fd294e8f3 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -46,7 +46,7 @@ private:
     std::unique_ptr<weld::Button> m_xPBDefault;
     std::unique_ptr<weld::Button> m_xPBAdd;
     std::unique_ptr<weld::Button> m_xPBRemove;
-    std::unique_ptr<ColorValueSet> m_xValSetColorBox;
+    std::unique_ptr<SvxColorValueSet> m_xValSetColorBox;
     std::unique_ptr<weld::CustomWeld> m_xValSetColorBoxWin;
 
     DECL_LINK(ResetToDefaults, weld::Button&, void);
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 4bae96abc837..b5f0983162a5 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -46,8 +46,8 @@ SvxColorTabPage::SvxColorTabPage(weld::Container* pPage, weld::DialogController*
     , rXFSet( aXFillAttr.GetItemSet() )
     , eCM( ColorModel::RGB )
     , m_context(comphelper::getProcessComponentContext())
-    , m_xValSetColorList(new ColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin")))
-    , m_xValSetRecentList(new ColorValueSet(nullptr))
+    , m_xValSetColorList(new SvxColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin")))
+    , m_xValSetRecentList(new SvxColorValueSet(nullptr))
     , m_xSelectPalette(m_xBuilder->weld_combo_box("paletteselector"))
     , m_xRbRGB(m_xBuilder->weld_radio_button("RGB"))
     , m_xRbCMYK(m_xBuilder->weld_radio_button("CMYK"))
@@ -154,8 +154,8 @@ void SvxColorTabPage::ImpColorCountChanged()
 {
     if (!pColorList.is())
         return;
-    m_xValSetColorList->SetColCount(ColorValueSet::getColumnCount());
-    m_xValSetRecentList->SetColCount(ColorValueSet::getColumnCount());
+    m_xValSetColorList->SetColCount(SvxColorValueSet::getColumnCount());
+    m_xValSetRecentList->SetColCount(SvxColorValueSet::getColumnCount());
 }
 
 void SvxColorTabPage::FillPaletteLB()