summaryrefslogtreecommitdiff
path: root/sd/qa
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-01-15 15:26:43 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-01-21 08:13:49 +0000
commit68d351fff469d0ab75f817a4e217194735258da8 (patch)
treef09be82d59b855a7904536ac0fbd38189639fa0a /sd/qa
parentacc3d942e1db108ebca3e9e0c086ab361acc3695 (diff)
oox: export Math objects to PPTX files
These hit the assert in lcl_StoreOwnAsOOXML now so better implement some export. (cherry picked from commit cb890ae43bacd2be24bc74fad2e2e5cce8910995) ugh, forgot to git add the test document (cherry picked from commit fc4fba0c77c849cf19d9c0e1b9270b745db60b89) Change-Id: I10c005a547e8a85f2a82198a49f9a03fc46a61d7 Reviewed-on: https://gerrit.libreoffice.org/21495 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sd/qa')
-rw-r--r--sd/qa/unit/data/odp/math.odpbin0 -> 12269 bytes
-rw-r--r--sd/qa/unit/export-tests.cxx28
2 files changed, 28 insertions, 0 deletions
diff --git a/sd/qa/unit/data/odp/math.odp b/sd/qa/unit/data/odp/math.odp
new file mode 100644
index 000000000000..c7605c5716c5
--- /dev/null
+++ b/sd/qa/unit/data/odp/math.odp
Binary files differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index da9d53f33e0a..33e1ba5a98b7 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -141,6 +141,7 @@ public:
void testFdo90607();
void testTdf91378();
void testBnc822341();
+ void testMathObject();
void testTdf80224();
void testTdf92527();
@@ -180,6 +181,7 @@ public:
CPPUNIT_TEST(testTdf91378);
CPPUNIT_TEST(testBnc822341);
+ CPPUNIT_TEST(testMathObject);
CPPUNIT_TEST(testTdf80224);
CPPUNIT_TEST(testExportTransitionsPPTX);
@@ -208,10 +210,12 @@ public:
{ "v", "urn:schemas-microsoft-com:vml" },
{ "a", "http://schemas.openxmlformats.org/drawingml/2006/main" },
{ "c", "http://schemas.openxmlformats.org/drawingml/2006/chart" },
+ { "m", "http://schemas.openxmlformats.org/officeDocument/2006/math" },
{ "pic", "http://schemas.openxmlformats.org/drawingml/2006/picture" },
{ "wp", "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" },
{ "p", "http://schemas.openxmlformats.org/presentationml/2006/main" },
{ "w", "http://schemas.openxmlformats.org/wordprocessingml/2006/main" },
+ { "a14", "http://schemas.microsoft.com/office/drawing/2010/main" },
{ "wps", "http://schemas.microsoft.com/office/word/2010/wordprocessingShape" },
{ "wpg", "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" },
};
@@ -1151,6 +1155,30 @@ void SdExportTest::testBnc822341()
xDocShRef->DoClose();
}
+void SdExportTest::testMathObject()
+{
+ // Check import / export of math object
+ ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("sd/qa/unit/data/odp/math.odp"), ODP);
+ utl::TempFile tempFile1;
+ xDocShRef = saveAndReload(xDocShRef, PPTX, &tempFile1);
+
+ // Export an LO specific ole object (imported from an ODP document)
+ {
+ xmlDocPtr pXmlDocContent = parseExport(tempFile1, "ppt/slides/slide1.xml");
+ assertXPath(pXmlDocContent,
+ "/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice",
+ "Requires",
+ "a14");
+ assertXPathContent(pXmlDocContent,
+ "/p:sld/p:cSld/p:spTree/mc:AlternateContent/mc:Choice/p:sp/p:txBody/a:p/a14:m/m:oMath/m:r[1]/m:t",
+ "a");
+
+ // TODO can't import yet
+ }
+
+ xDocShRef->DoClose();
+}
+
void SdExportTest::testBulletMarginAndIndentation()
{
::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc("/sd/qa/unit/data/pptx/bulletMarginAndIndent.pptx"), PPTX );