From ed3fc457e1fbdfd2cff808e259d62d1d537a01ce Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Mon, 10 Mar 2014 18:16:18 +0100 Subject: [PATCH] add strict OOXML pptx import test Change-Id: I2e4f17b7b7ab1e14c5cb0f6ce90e771d7c20a5c8 --- sd/qa/unit/data/strict_ooxml.pptx | Bin 0 -> 29966 bytes sd/qa/unit/import-tests.cxx | 16 ++++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 sd/qa/unit/data/strict_ooxml.pptx diff --git a/sd/qa/unit/data/strict_ooxml.pptx b/sd/qa/unit/data/strict_ooxml.pptx new file mode 100644 index 0000000000000000000000000000000000000000..534b483ff421625ccd1e5e505ae807e5fa7bfb7c GIT binary patch literal 29966 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 literal 0 HcmV?d00001 diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 0f5732cdd082..eb3b56d2927b 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -60,6 +60,7 @@ public: void testN821567(); void testFdo68594(); void testFdo72998(); + void testStrictOOXML(); CPPUNIT_TEST_SUITE(SdFiltersTest); CPPUNIT_TEST(testDocumentLayout); @@ -76,6 +77,7 @@ public: CPPUNIT_TEST(testN821567); CPPUNIT_TEST(testFdo68594); CPPUNIT_TEST(testFdo72998); + CPPUNIT_TEST(testStrictOOXML); CPPUNIT_TEST_SUITE_END(); }; @@ -538,6 +540,20 @@ void SdFiltersTest::testFdo71075() CPPUNIT_ASSERT_MESSAGE( "Invalid Series count", aValues.getConstArray()[i] == values[i]); } +void SdFiltersTest::testStrictOOXML() +{ + ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/strict_ooxml.pptx")); + CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() ); + CPPUNIT_ASSERT_MESSAGE( "not in destruction", !xDocShRef->IsInDestruction() ); + + SdDrawDocument *pDoc = xDocShRef->GetDoc(); + CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL ); + uno::Reference< drawing::XDrawPagesSupplier > xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW ); + uno::Reference< drawing::XDrawPage > xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW ); + uno::Reference< drawing::XShape > xShape(xPage->getByIndex(0), uno::UNO_QUERY_THROW ); + CPPUNIT_ASSERT_MESSAGE( "failed to load shape", xShape.is() ); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdFiltersTest); CPPUNIT_PLUGIN_IMPLEMENT();