summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga991@gmail.com>2020-10-09 10:20:49 +0200
committerLászló Németh <nemeth@numbertext.org>2020-10-13 13:52:49 +0200
commita41cf57c1eb4cabe5afc1a45d6fe535dbb935217 (patch)
tree08d184ba44054c83fc440ea47078ec4b2af08f96 /sw/qa
parent51f807841a9242eec85172c6503083294c0c0042 (diff)
tdf#134987 convert DOCX to ODT: fix lost charts
Embedded charts of DOCX documents were lost or replaced by images during conversion to native ODT format, resulted by bad handling of XEmbedPersist objects in EmbeddedObjectContainer. Note: Add missing loext:external-data to ODF 1.3 schema definition to fix ODF validation error in gerrit. See commit 2054af83fefb955e20de2b40178a11726525057e (fdo#72520 : Added property to store external data path in chart) and commit a49a9dab3168c03a539adc131f2ade03236edb69 (fix one more ODF validation error). Change-Id: I9edff9af3a79370ea447ffc6078da3520d0c6f63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104104 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/odfexport/data/tdf134987.docxbin0 -> 39541 bytes
-rw-r--r--sw/qa/extras/odfexport/odfexport.cxx53
2 files changed, 53 insertions, 0 deletions
diff --git a/sw/qa/extras/odfexport/data/tdf134987.docx b/sw/qa/extras/odfexport/data/tdf134987.docx
new file mode 100644
index 000000000000..c828bf442e1c
--- /dev/null
+++ b/sw/qa/extras/odfexport/data/tdf134987.docx
Binary files differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 264edddea196..08166b3c2ccb 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -46,6 +46,7 @@
#include <comphelper/storagehelper.hxx>
#include <comphelper/fileformat.h>
#include <comphelper/propertysequence.hxx>
+#include <comphelper/documentconstants.hxx>
#include <unotools/streamwrap.hxx>
#include <svl/PasswordHelper.hxx>
#include <comphelper/sequenceashashmap.hxx>
@@ -778,6 +779,58 @@ DECLARE_ODFEXPORT_TEST(testFdo58949, "fdo58949.docx")
CPPUNIT_ASSERT_EQUAL(3, nMatches);
}
+DECLARE_ODFEXPORT_TEST(testTdf134987, "tdf134987.docx")
+{
+ uno::Reference<text::XTextEmbeddedObjectsSupplier> xTEOSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XNameAccess> xAccess(xTEOSupplier->getEmbeddedObjects());
+ uno::Sequence<OUString> aSeq(xAccess->getElementNames());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aSeq.getLength());
+
+ OUString aMediaType;
+ // checking first object (formula)
+ {
+ uno::Reference<document::XEmbeddedObjectSupplier> xEOSupplier(xAccess->getByName("1"), uno::UNO_QUERY);
+ uno::Reference<lang::XComponent> xObj(xEOSupplier->getEmbeddedObject());
+ CPPUNIT_ASSERT(xObj.is());
+
+ uno::Reference<document::XStorageBasedDocument> xSBDoc(xObj, uno::UNO_QUERY);
+ uno::Reference<embed::XStorage> xStorage(xSBDoc->getDocumentStorage());
+ CPPUNIT_ASSERT(xStorage.is());
+
+ uno::Reference< beans::XPropertySet > xStorProps(xStorage, uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT(xStorProps->getPropertyValue("MediaType") >>= aMediaType);
+ CPPUNIT_ASSERT(aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII));
+ }
+ // checking second object (chart)
+ {
+ uno::Reference<document::XEmbeddedObjectSupplier> xEOSupplier(xAccess->getByName("2"), uno::UNO_QUERY);
+ uno::Reference<lang::XComponent> xObj(xEOSupplier->getEmbeddedObject());
+ CPPUNIT_ASSERT(xObj.is());
+
+ uno::Reference<document::XStorageBasedDocument> xSBDoc(xObj, uno::UNO_QUERY);
+ uno::Reference<embed::XStorage> xStorage(xSBDoc->getDocumentStorage());
+ CPPUNIT_ASSERT(xStorage.is());
+
+ uno::Reference< beans::XPropertySet > xStorProps(xStorage, uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT(xStorProps->getPropertyValue("MediaType") >>= aMediaType);
+ CPPUNIT_ASSERT(aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII));
+ }
+ // checking third object (chart)
+ {
+ uno::Reference<document::XEmbeddedObjectSupplier> xEOSupplier(xAccess->getByName("3"), uno::UNO_QUERY);
+ uno::Reference<lang::XComponent> xObj(xEOSupplier->getEmbeddedObject());
+ CPPUNIT_ASSERT(xObj.is());
+
+ uno::Reference<document::XStorageBasedDocument> xSBDoc(xObj, uno::UNO_QUERY);
+ uno::Reference<embed::XStorage> xStorage(xSBDoc->getDocumentStorage());
+ CPPUNIT_ASSERT(xStorage.is());
+
+ uno::Reference< beans::XPropertySet > xStorProps(xStorage, uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT(xStorProps->getPropertyValue("MediaType") >>= aMediaType);
+ CPPUNIT_ASSERT(aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII));
+ }
+}
+
DECLARE_ODFEXPORT_TEST(testStylePageNumber, "ooo321_stylepagenumber.odt")
{
CPPUNIT_ASSERT_EQUAL(5, getPages());