diff options
| author | Henry Castro <hcastro@collabora.com> | 2023-09-28 15:01:43 -0400 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-10-03 11:32:22 +0200 |
| commit | 08ed103d734ebf65202dc097c7bb0990573f8fd1 (patch) | |
| tree | 7025c7aeea8b35ca259c8fe8b944b4778727f19a /sd | |
| parent | 84ac58c37fffa0c8b6d55c70009515d013ad65b4 (diff) | |
tdf#155512: oox: ppt: fix import master slides
Import all master slides according to
the relationship with slide layouts.
Adjust unit test values:
SdOOXMLExportTest2::testTdf106867
I do not know why those values change since
importing embedded video source code was not touched
SdOOXMLExportTest2::testAccentColor
The accent6 is a constant value.
Signed-off-by: Henry Castro <hcastro@collabora.com>
Change-Id: Ic7c70d2c4ce30a7f2d2d1cf22604f1119a66f5f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157387
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index a777de2b385c..1996210bc6c2 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -1462,7 +1462,7 @@ void SdOOXMLExportTest2::testTdf106867() "/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/" "p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:cmd/" "p:cBhvr/p:tgtEl/p:spTgt", - "spid", "42"); + "spid", "491"); } void SdOOXMLExportTest2::testTdf112280() @@ -1843,7 +1843,7 @@ void SdOOXMLExportTest2::testAccentColor() "70ad47"); xmlDocUniquePtr pXmlDocTheme2 = parseExport("ppt/theme/theme2.xml"); assertXPath(pXmlDocTheme2, "/a:theme/a:themeElements/a:clrScheme/a:accent6/a:srgbClr", "val", - "deb340"); + "70ad47"); // Without the accompanying fix in place, this test would have failed with: // - Expected: Motyw pakietu Office |