Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 62 insertions, 0 deletions

diff --git a/sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt b/sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt
new file mode 100644
index 000000000..f8aee0836
--- /dev/null
+++ b/sw/qa/extras/fodfexport/data/tdf113696-writerimage.odt
diff --git a/sw/qa/extras/fodfexport/data/tdf113696.odt b/sw/qa/extras/fodfexport/data/tdf113696.odt
new file mode 100644
index 000000000..03e0612a3
--- /dev/null
+++ b/sw/qa/extras/fodfexport/data/tdf113696.odt
diff --git a/sw/qa/extras/fodfexport/fodfexport.cxx b/sw/qa/extras/fodfexport/fodfexport.cxx
new file mode 100644
index 000000000..53297da28
--- /dev/null
+++ b/sw/qa/extras/fodfexport/fodfexport.cxx
@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <swmodeltestbase.hxx>
+#include <o3tl/string_view.hxx>
+
+class Test : public SwModelTestBase
+{
+public:
+    Test()
+        : SwModelTestBase("/sw/qa/extras/fodfexport/data/", "OpenDocument Text Flat XML")
+    {
+    }
+
+    /**
+     * Denylist handling
+     */
+    bool mustTestImportOf(const char* filename) const override
+    {
+        // Only test import of .fodt document
+        return o3tl::ends_with(filename, ".odt") || o3tl::ends_with(filename, ".fodt");
+    }
+};
+
+DECLARE_FODFEXPORT_TEST(testTdf113696, "tdf113696.odt")
+{
+    CPPUNIT_ASSERT_EQUAL(1, getShapes());
+    CPPUNIT_ASSERT_EQUAL(1, getPages());
+    // Test that an image which is written in svm format (image/x-vclgraphic)
+    // is accompanied by a png fallback graphic.
+    if (xmlDocUniquePtr pXmlDoc = parseExportedFile())
+    {
+        assertXPath(pXmlDoc, "/office:document/office:body/office:text/text:p/draw:frame/"
+                             "draw:image[@draw:mime-type='image/x-vclgraphic']");
+        assertXPath(pXmlDoc, "/office:document/office:body/office:text/text:p/draw:frame/"
+                             "draw:image[@draw:mime-type='image/png']");
+    }
+}
+
+DECLARE_FODFEXPORT_TEST(testTdf113696WriterImage, "tdf113696-writerimage.odt")
+{
+    CPPUNIT_ASSERT_EQUAL(1, getShapes());
+    CPPUNIT_ASSERT_EQUAL(1, getPages());
+    // Same as testTdf113696, but with a writer image instead of a draw image
+    // (they use different code paths).
+    if (xmlDocUniquePtr pXmlDoc = parseExportedFile())
+    {
+        assertXPath(pXmlDoc, "/office:document/office:body/office:text/text:p/draw:frame/"
+                             "draw:image[@draw:mime-type='image/x-vclgraphic']");
+        assertXPath(pXmlDoc, "/office:document/office:body/office:text/text:p/draw:frame/"
+                             "draw:image[@draw:mime-type='image/png']");
+    }
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */