From 75c0d7827625c683d52a9e2f3a7c514df890107b Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Fri, 27 Jan 2023 15:03:09 +0900 Subject: sd: use XTheme to transport the theme to xmloff import/export MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- xmloff/inc/XMLThemeContext.hxx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'xmloff/inc') 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 #include -#include -#include +#include +#include /// Imports the theme class XMLThemeContext : public SvXMLImportContext { css::uno::Reference 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 mpColorSet; std::vector m_aColorScheme; public: XMLColorTableContext(SvXMLImport& rImport, css::uno::Reference const& xAttrList, - comphelper::SequenceAsHashMap& rTheme); + model::Theme& mrTheme); ~XMLColorTableContext(); css::uno::Reference SAL_CALL createFastChildContext( @@ -57,7 +58,7 @@ class XMLColorContext : public SvXMLImportContext public: XMLColorContext(SvXMLImport& rImport, css::uno::Reference const& xAttrList, - std::vector& rColorScheme); + std::unique_ptr& rpColorSet); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit 4.04'>distro/collabora/co-24.04 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/idlc
AgeCommit message (Expand)Author
2022-06-11Use idlc/test/parser/conversion.tests in CustomTarget_unoidl/unoidl-write_testStephan Bergmann
2022-06-10[API CHANGE] Remove deprecated idlc and regmerge from the SDKStephan Bergmann
2022-05-18clang-tidy modernize-pass-by-value in idl/idlcNoel Grandin
2022-05-06Remove duplicated includesAndrea Gelmini
2022-05-05use more o3tl::getTokenNoel Grandin
2022-04-28use more string_view in idlcNoel Grandin
2022-04-17tdf#143148 use pragma once in idlcAman Jha
2022-04-10loplugin:stringview check for getToken and trimNoel Grandin
2022-01-08Unify condition names and fix "else" pathsJan-Marek Glogowski
2021-12-28idlc: Always use sys/wait.h on UNIXIsmael Luceno
2021-12-22loplugin:flatten in filter..includeNoel Grandin
2021-11-07forward decls go after #includeNoel Grandin
2021-09-23Extend loplugin:stringviewparam to starts/endsWith: idlcStephan Bergmann
2021-08-12make --with-idlc-cpp=cpp work for gcc cpp as a ucpp replacementCaolán McNamara
2021-07-23no need to allocate these static vars on demandNoel Grandin
2021-06-28loplugin:indentation improve checks for brace alignmentNoel Grandin