move ColorSet class to own file inside docmodel

Also move ColorSet from svx to model namespace so it is consistent
with other classes in docmodel.

Change-Id: Iacbdbdf5ece4015c628a0e45adf6a732b2d27777
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146220
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

3 files changed, 11 insertions, 11 deletions

diff --git a/sw/source/core/inc/ThemeColorChanger.hxx b/sw/source/core/inc/ThemeColorChanger.hxx
index a246f17453a1..71526f79d216 100644
--- a/sw/source/core/inc/ThemeColorChanger.hxx
+++ b/sw/source/core/inc/ThemeColorChanger.hxx
@@ -10,7 +10,7 @@
 #pragma once
 
 #include <docsh.hxx>
-#include <svx/ColorSets.hxx>
+#include <docmodel/theme/ColorSet.hxx>
 #include <svx/theme/ThemeColorChanger.hxx>
 
 namespace sw
@@ -24,7 +24,7 @@ public:
     ThemeColorChanger(SwDocShell* pDocSh);
     virtual ~ThemeColorChanger() override;
 
-    void apply(svx::ColorSet const& rColorSet) override;
+    void apply(model::ColorSet const& rColorSet) override;
 };
 
 } // end sw namespace
diff --git a/sw/source/core/model/ThemeColorChanger.cxx b/sw/source/core/model/ThemeColorChanger.cxx
index dc9a7fe1c86c..715c02e68b63 100644
--- a/sw/source/core/model/ThemeColorChanger.cxx
+++ b/sw/source/core/model/ThemeColorChanger.cxx
@@ -46,10 +46,10 @@ namespace
 class ThemeColorHandler : public sw::ModelTraverseHandler
 {
     SwDoc& mrDocument;
-    svx::ColorSet const& mrColorSet;
+    model::ColorSet const& mrColorSet;
 
 public:
-    ThemeColorHandler(SwDoc& rDocument, svx::ColorSet const& rColorSet)
+    ThemeColorHandler(SwDoc& rDocument, model::ColorSet const& rColorSet)
         : mrDocument(rDocument)
         , mrColorSet(rColorSet)
     {
@@ -115,7 +115,7 @@ public:
     }
 };
 
-void changeColor(SwFormat* pFormat, svx::ColorSet const& rColorSet, SwDoc* pDocument)
+void changeColor(SwFormat* pFormat, model::ColorSet const& rColorSet, SwDoc* pDocument)
 {
     const SwAttrSet& rAttrSet = pFormat->GetAttrSet();
     std::unique_ptr<SfxItemSet> pNewSet = rAttrSet.Clone();
@@ -142,7 +142,7 @@ ThemeColorChanger::ThemeColorChanger(SwDocShell* pDocSh)
 
 ThemeColorChanger::~ThemeColorChanger() = default;
 
-void ThemeColorChanger::apply(svx::ColorSet const& rColorSet)
+void ThemeColorChanger::apply(model::ColorSet const& rColorSet)
 {
     SwDoc* pDocument = mpDocSh->GetDoc();
     if (!pDocument)
@@ -154,13 +154,13 @@ void ThemeColorChanger::apply(svx::ColorSet const& rColorSet)
     svx::Theme* pTheme = pPage->getSdrPageProperties().GetTheme();
     if (pTheme)
     {
-        pTheme->SetColorSet(std::make_unique<svx::ColorSet>(rColorSet));
+        pTheme->SetColorSet(std::make_unique<model::ColorSet>(rColorSet));
     }
     else
     {
         pPage->getSdrPageProperties().SetTheme(std::make_unique<svx::Theme>("Office"));
         pTheme = pPage->getSdrPageProperties().GetTheme();
-        pTheme->SetColorSet(std::make_unique<svx::ColorSet>(rColorSet));
+        pTheme->SetColorSet(std::make_unique<model::ColorSet>(rColorSet));
     }
 
     SfxStyleSheetBasePool* pPool = mpDocSh->GetStyleSheetPool();
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index 76fd5e59870b..d2c225c171c3 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -59,10 +59,10 @@ ThemePanel::ThemePanel(weld::Widget* pParent)
             maColorSets.insert(*pTheme->GetColorSet());
     }
 
-    const std::vector<svx::ColorSet>& aColorSets = maColorSets.getColorSets();
+    const std::vector<model::ColorSet>& aColorSets = maColorSets.getColorSets();
     for (size_t i = 0; i < aColorSets.size(); ++i)
     {
-        const svx::ColorSet& rColorSet = aColorSets[i];
+        const model::ColorSet& rColorSet = aColorSets[i];
         mxValueSetColors->insert(rColorSet);
     }
 
@@ -106,7 +106,7 @@ void ThemePanel::DoubleClickHdl()
         return;
     sal_uInt32 nIndex = nItemId - 1;
 
-    svx::ColorSet const& rColorSet = maColorSets.getColorSet(nIndex);
+    model::ColorSet const& rColorSet = maColorSets.getColorSet(nIndex);
 
     ThemeColorChanger aChanger(pDocSh);
     aChanger.apply(rColorSet);