diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2022-05-24 20:11:47 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-07-04 08:06:52 +0200 |
| commit | 3776c15fdf63262721126539bdaa6fd5d4474b1c (patch) | |
| tree | 3180619aeea91f12ab590a0075a89581f5d3b36e /include | |
| parent | c45b788517c9db9f8f3c0294ef3f8fdaae890815 (diff) | |
tdf#149205 sd theme: fix PPTX export loosing dk1 and lt1 colors
Document theme of Impress documents were exported to PPTX only
partially: dk1 and lt1 was hardcoded to the SYS_COLOR_SCHEMES define,
while the rest was written from master-slide-specific svx::Theme.
The benefit of this is that our theme is just a set of colors
(<a:srgbClr> markup in OOXML), while dk1 and lt1 is more dynamic by
default in PowerPoint (<a:sysClr> in OOXML). The downside is that this
way a custom dk1 and lt1 color was lost on export.
Fix the problem by switching to <a:srgbClr> markup even for dk1 and lt1:
not using the <a:sysClr> markup doesn't seem to be a problem in
practice, or at least much less problematic than rendering with bad
colors.
If there is a need, dedicated <a:sysClr> markup support can be still
added later by extending svx::ColorSet::maColors to not only store a
list of colors, but also some additional properties of those colors.
(cherry picked from commit 4a54a24c207f3040390e2fefec41cbbf0edd5eca)
Change-Id: I26df3fd8c891c217df0d36382f6599805198f4bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136747
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/drawingml/clrscheme.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx index 01711fe8bfbd..a4f0b653441a 100644 --- a/include/oox/drawingml/clrscheme.hxx +++ b/include/oox/drawingml/clrscheme.hxx @@ -34,9 +34,9 @@ namespace oox::drawingml { enum PredefinedClrSchemeId { - //dk1, - //lt1, - dk2 = 0, + dk1 = 0, + lt1, + dk2, lt2, accent1, accent2, @@ -51,8 +51,8 @@ enum PredefinedClrSchemeId { static std::map<PredefinedClrSchemeId, OUString> PredefinedClrNames = { - //{ dk1, "dk1" }, - //{ lt1, "lt1" }, + { dk1, "dk1" }, + { lt1, "lt1" }, { dk2, "dk2" }, { lt2, "lt2" }, { accent1, "accent1" }, |