sd/qa/unit/data/pptx/tdf152335.pptx |binary
sd/qa/unit/export-tests-ooxml1.cxx | 12 ++++++++++++
sd/source/filter/eppt/pptx-epptooxml.cxx | 11 -----------
3 files changed, 12 insertions(+), 11 deletions(-)
New commits:
commit 2dda846bcb32b13d9b6159003702db4359fec8b7
Author: Tibor Nagy <nagy.tib...@nisz.hu>
AuthorDate: Thu Dec 1 09:33:58 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Dec 19 17:37:33 2022 +0000
tdf#152335 PPTX export: fix 3D shape properties of the shape in theme
The shapes got extra 3D shape properties by the default template,
which caused visible difference in MSO.
Follow-up to commit I02f1edea84b50dbb9b0e0a59b6062a29894afde4
(tdf#152186 PPTX export: fix shadow of the shape in theme)
Follow-up to commit 25e9766e9b87342b6f1b29dc146d5f33e12157a7
(tdf#92222 PPTX export: fix line width of the shape in theme)
Change-Id: I84f931e45e7656c456fe910cbb5e09aabeb8924f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143516
Reviewed-by: László Németh <nem...@numbertext.org>
Tested-by: László Németh <nem...@numbertext.org>
(cherry picked from commit 40ea23ecdb46dfe4f4677ddbe5cb82d7f71ee592)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144477
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sd/qa/unit/data/pptx/tdf152335.pptx
b/sd/qa/unit/data/pptx/tdf152335.pptx
new file mode 100644
index 000000000000..03c8612bb54c
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf152335.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx
b/sd/qa/unit/export-tests-ooxml1.cxx
index d61d0c0991d4..2c3c5a0152e3 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -51,6 +51,7 @@ public:
{
}
+ void testTdf152335();
void testTdf149803();
void testTdf149311();
void testTdf149128();
@@ -125,6 +126,7 @@ public:
CPPUNIT_TEST_SUITE(SdOOXMLExportTest1);
+ CPPUNIT_TEST(testTdf152335);
CPPUNIT_TEST(testTdf149803);
CPPUNIT_TEST(testTdf149311);
CPPUNIT_TEST(testTdf149128);
@@ -225,6 +227,16 @@ void checkFontAttributes(const SdrTextObj* pObj, ItemValue
nVal, sal_uInt32 nId)
}
}
+void SdOOXMLExportTest1::testTdf152335()
+{
+ createSdImpressDoc("pptx/tdf152335.pptx");
+ save("Impress Office Open XML");
+
+ xmlDocUniquePtr pXmlDocTheme = parseExport("ppt/theme/theme1.xml");
+ assertXPathChildren(
+ pXmlDocTheme,
"/a:theme/a:themeElements/a:fmtScheme/a:effectStyleLst/a:effectStyle[3]", 1);
+}
+
void SdOOXMLExportTest1::testTdf149803()
{
createSdImpressDoc("pptx/tdf149803.pptx");
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 842c7944d0c3..05ec471f610f 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -2048,17 +2048,6 @@ ShapeExport&
PowerPointShapeExport::WritePlaceholderReferenceTextBody(
</a:srgbClr>\
</a:outerShdw>\
</a:effectLst>\
- <a:scene3d>\
- <a:camera prst=\"orthographicFront\">\
- <a:rot lat=\"0\" lon=\"0\" rev=\"0\"/>\
- </a:camera>\
- <a:lightRig rig=\"threePt\" dir=\"t\">\
- <a:rot lat=\"0\" lon=\"0\" rev=\"1200000\"/>\
- </a:lightRig>\
- </a:scene3d>\
- <a:sp3d>\
- <a:bevelT w=\"63500\" h=\"25400\"/>\
- </a:sp3d>\
</a:effectStyle>\
</a:effectStyleLst>\
<a:bgFillStyleLst>\
