diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-01-27 15:03:09 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-01-31 08:59:09 +0000 |
| commit | 75c0d7827625c683d52a9e2f3a7c514df890107b (patch) | |
| tree | 8ac5856ae7ae10a1aa558dfe2eca3fbe918d842d /xmloff/inc | |
| parent | ed9d987e2ad8f6af554a5fc1f858ca48c6970446 (diff) | |
sd: use XTheme to transport the theme to xmloff import/export
Refactor the existing places and tests in Impress code (sd) to
use it instead.
Also keep the old property of construction and view of the theme
with a sequence of property values, but under the new property
named "ThemeUnoRepresentation". This is needed by the UI tests
currently.
Change-Id: I484567f4a603f1a5e2e03955fdd2b63132dcc66e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146225
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'xmloff/inc')
| -rw-r--r-- | xmloff/inc/XMLThemeContext.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xmloff/inc/XMLThemeContext.hxx b/xmloff/inc/XMLThemeContext.hxx index 706c1251a534..50889a0ddf98 100644 --- a/xmloff/inc/XMLThemeContext.hxx +++ b/xmloff/inc/XMLThemeContext.hxx @@ -14,14 +14,14 @@ #include <com/sun/star/util/Color.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <comphelper/sequenceashashmap.hxx> -#include <comphelper/namecontainer.hxx> +#include <docmodel/theme/Theme.hxx> +#include <docmodel/theme/ColorSet.hxx> /// Imports the theme class XMLThemeContext : public SvXMLImportContext { css::uno::Reference<css::drawing::XDrawPage> m_xPage; - comphelper::SequenceAsHashMap m_aTheme; + model::Theme maTheme; public: XMLThemeContext(SvXMLImport& rImport, @@ -37,13 +37,14 @@ public: /// Imports the color table of a theme class XMLColorTableContext : public SvXMLImportContext { - comphelper::SequenceAsHashMap& m_rTheme; + model::Theme& mrTheme; + std::unique_ptr<model::ColorSet> mpColorSet; std::vector<css::util::Color> m_aColorScheme; public: XMLColorTableContext(SvXMLImport& rImport, css::uno::Reference<css::xml::sax::XFastAttributeList> const& xAttrList, - comphelper::SequenceAsHashMap& rTheme); + model::Theme& mrTheme); ~XMLColorTableContext(); css::uno::Reference<css::xml::sax::XFastContextHandler> SAL_CALL createFastChildContext( @@ -57,7 +58,7 @@ class XMLColorContext : public SvXMLImportContext public: XMLColorContext(SvXMLImport& rImport, css::uno::Reference<css::xml::sax::XFastAttributeList> const& xAttrList, - std::vector<css::util::Color>& rColorScheme); + std::unique_ptr<model::ColorSet>& rpColorSet); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |