diff options
| author | Regényi Balázs <regenyi.balazs@nisz.hu> | 2020-09-15 11:38:18 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-09-23 12:06:16 +0200 |
| commit | ce405819f36496398e5ca389f12eafb3cfdc64ae (patch) | |
| tree | dbfd3022c14605a498693e04039cbdd231f4558e /sw/qa | |
| parent | eed7c2f215173bf3799e4ee34771a3f64bf06f74 (diff) | |
tdf#136566 XLSX export: fix lost scheme based line colors
by converting scheme color identifiers to colors temporarily.
Because we haven't exported theme XML yet, we could not import
shapes of these exported documents correctly, resulting missing
lines.
Co-authored-by: Szabolcs Toth
Change-Id: I4f3d19cb8a9a851fb07a97f798195011e420d441
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102722
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx index e5bc49ddd189..44d0bc8c27bd 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx @@ -789,9 +789,10 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testShapeThemePreservation, "shape-theme-pre assertXPath(pXmlDocument, "/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:solidFill/a:schemeClr", "val", "accent6"); + // check whether theme color has been converted into native color assertXPath(pXmlDocument, - "/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:solidFill/a:schemeClr", - "val", "accent3"); + "/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:solidFill/a:srgbClr", + "val", "9bbb59"); // check color transformations applied to theme colors have been preserved assertXPath(pXmlDocument, @@ -801,7 +802,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testShapeThemePreservation, "shape-theme-pre "/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:solidFill/a:schemeClr/a:lumOff", "val", "60000"); assertXPath(pXmlDocument, - "/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:solidFill/a:schemeClr/a:lumMod", + "/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:solidFill/a:srgbClr/a:lumMod", "val", "50000"); // check direct color assignments have been preserved |