move Theme class to own file inside docmodel

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

Theme header also includes ThemeSupplementalFont, ThemeFont,
FontScheme classes that are used by the Theme and were also moved
to docmodel. These may be moved to its own file in the future when
they are used in more places.

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

5 files changed, 8 insertions, 8 deletions

diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index d837092eba68..4237aa8af7af 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -494,7 +494,7 @@ std::vector<Color> DrawDocShell::GetThemeColors()
     }
 
     SdPage* pPage = pViewShell->getCurrentPage();
-    svx::Theme* pTheme = pPage->getSdrPageProperties().GetTheme();
+    model::Theme* pTheme = pPage->getSdrPageProperties().GetTheme();
     if (!pPage->IsMasterPage())
     {
         pTheme = pPage->TRG_GetMasterPage().getSdrPageProperties().GetTheme();
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index e7f0bb3a67bb..ea8443d9183b 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -379,7 +379,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
                 pThemePage = &pThemePage->TRG_GetMasterPage();
             }
 
-            svx::Theme* pTheme = pThemePage->getSdrPageProperties().GetTheme();
+            model::Theme* pTheme = pThemePage->getSdrPageProperties().GetTheme();
             if (pTheme)
             {
                 // We construct an object on a page where the master page has a theme. Take the
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 098295758b40..edb242ab1a6e 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -265,7 +265,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest&
     if (mpDoc->GetDocumentType() == DocumentType::Impress && mpPage->IsMasterPage())
     {
         // A master slide may have a theme.
-        svx::Theme* pTheme = mpPage->getSdrPageProperties().GetTheme();
+        model::Theme* pTheme = mpPage->getSdrPageProperties().GetTheme();
         if (pTheme)
         {
             uno::Any aTheme;
@@ -573,7 +573,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
             auto it = pGrabBag->GetGrabBag().find("Theme");
             if (it != pGrabBag->GetGrabBag().end())
             {
-                std::unique_ptr<svx::Theme> pTheme = svx::Theme::FromAny(it->second);
+                std::unique_ptr<model::Theme> pTheme = model::Theme::FromAny(it->second);
                 pMasterPage->getSdrPageProperties().SetTheme(std::move(pTheme));
             }
             else
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index d68c4cf4a2f8..9b9ed18dbfc6 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1281,7 +1281,7 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam
         case WID_MODEL_THEME:
             {
                 SdrModel& rModel = getSdrModelFromUnoModel();
-                std::unique_ptr<svx::Theme> pTheme = svx::Theme::FromAny(aValue);
+                std::unique_ptr<model::Theme> pTheme = model::Theme::FromAny(aValue);
                 rModel.SetTheme(std::move(pTheme));
             }
             break;
@@ -1408,7 +1408,7 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property
         case WID_MODEL_THEME:
             {
                 SdrModel& rModel = getSdrModelFromUnoModel();
-                svx::Theme* pTheme = rModel.GetTheme();
+                model::Theme* pTheme = rModel.GetTheme();
                 if (pTheme)
                 {
                     pTheme->ToAny(aAny);
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index dda5cb3baea0..2dfff467ceb7 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -976,7 +976,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
         case WID_PAGE_THEME:
         {
             SdrPage* pPage = GetPage();
-            std::unique_ptr<svx::Theme> pTheme = svx::Theme::FromAny(aValue);
+            std::unique_ptr<model::Theme> pTheme = model::Theme::FromAny(aValue);
             pPage->getSdrPageProperties().SetTheme(std::move(pTheme));
             break;
         }
@@ -1298,7 +1298,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
     case WID_PAGE_THEME:
     {
         SdrPage* pPage = GetPage();
-        svx::Theme* pTheme = pPage->getSdrPageProperties().GetTheme();
+        model::Theme* pTheme = pPage->getSdrPageProperties().GetTheme();
         if (pTheme)
         {
             pTheme->ToAny(aAny);