diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-01-27 08:41:16 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-01-27 03:22:22 +0000 |
| commit | c9fb441c55d03f55877ed3bb2f5c39310d1ec44b (patch) | |
| tree | fb40c02e666cabb8cb218a0b39dba8d4a3a19106 /sd/source/filter | |
| parent | 69c6f7bccec838b7288a25a29a83b7f782ba7586 (diff) | |
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>
Diffstat (limited to 'sd/source/filter')
| -rw-r--r-- | sd/source/filter/eppt/epptooxml.hxx | 6 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 5ee3248ec81e..48c928d60abb 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -26,7 +26,7 @@ using ::sax_fastparser::FSHelperPtr; -namespace svx +namespace model { class Theme; } @@ -92,13 +92,13 @@ private: void ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum ); /// Export the color set part of a theme. - static bool WriteColorSets(const FSHelperPtr& pFS, svx::Theme* pTheme); + static bool WriteColorSets(const FSHelperPtr& pFS, model::Theme* pTheme); /// Same as WriteColorSets(), but works from a grab-bag. bool WriteColorSchemes(const FSHelperPtr& pFS, const OUString& rThemePath); static void WriteDefaultColorSchemes(const FSHelperPtr& pFS); - void WriteTheme( sal_Int32 nThemeNum, svx::Theme* pTheme ); + void WriteTheme( sal_Int32 nThemeNum, model::Theme* pTheme ); virtual bool ImplCreateDocument() override; virtual bool ImplCreateMainNotes() override; diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 23eaeba53715..16208f48fb79 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -1508,7 +1508,7 @@ void PowerPointExport::ImplWriteSlideMaster(sal_uInt32 nPageNum, Reference< XPro "application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml"); SdrPage* pMasterPage = SdPage::getImplementation(mXDrawPage); - svx::Theme* pTheme = nullptr; + model::Theme* pTheme = nullptr; if (pMasterPage) { pTheme = pMasterPage->getSdrPageProperties().GetTheme(); @@ -2153,7 +2153,7 @@ void PowerPointExport::WriteDefaultColorSchemes(const FSHelperPtr& pFS) } } -bool PowerPointExport::WriteColorSets(const FSHelperPtr& pFS, svx::Theme* pTheme) +bool PowerPointExport::WriteColorSets(const FSHelperPtr& pFS, model::Theme* pTheme) { static std::map<PredefinedClrSchemeId, sal_Int32> aPredefinedClrTokens = { @@ -2251,7 +2251,7 @@ bool PowerPointExport::WriteColorSchemes(const FSHelperPtr& pFS, const OUString& return false; } -void PowerPointExport::WriteTheme(sal_Int32 nThemeNum, svx::Theme* pTheme) +void PowerPointExport::WriteTheme(sal_Int32 nThemeNum, model::Theme* pTheme) { OUString sThemePath = "ppt/theme/theme" + OUString::number(nThemeNum + 1) + ".xml"; |