[Libreoffice-commits] core.git: sd/qa xmloff/source

[Serge Krot]

 sd/qa/unit/data/odp/tdf115005.odp          |binary
 sd/qa/unit/export-tests-ooxml2.cxx         |   22 ++++++++++++++++++++++
 xmloff/source/core/xmlmultiimagehelper.cxx |    4 ++++
 3 files changed, 26 insertions(+)

New commits:
commit 79b2f1cb36ea4fec61b0620085313eb53fce9fa0
Author: Serge Krot <Serge.Krot at cib.de>
Date:   Mon Mar 19 22:19:38 2018 +0100

    tdf#115005 Do not remove original vector images from slides
    
    During calculation of the quality index of the image, we should
    take into account also SVM vector image type.
    Its mime type is image/x-vclgraphic.
    
    Change-Id: I7c723e99995f73258bb59d976a6c7670c51f7a25
    Reviewed-on: https://gerrit.libreoffice.org/51599
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sd/qa/unit/data/odp/tdf115005.odp b/sd/qa/unit/data/odp/tdf115005.odp
new file mode 100755
index 000000000000..764a862feda7
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf115005.odp differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index d2c1cdc33256..0cf675be8cf2 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -133,6 +133,7 @@ public:
     void testTdf115394();
     void testTdf115394Zero();
     void testBulletsAsImage();
+    void testTdf115005();
     void testTdf111789();
     /// SmartArt animated elements
     void testTdf104792();
@@ -197,6 +198,7 @@ public:
     CPPUNIT_TEST(testTdf115394);
     CPPUNIT_TEST(testTdf115394Zero);
     CPPUNIT_TEST(testBulletsAsImage);
+    CPPUNIT_TEST(testTdf115005);
     CPPUNIT_TEST(testTdf111789);
     CPPUNIT_TEST(testTdf104792);
     CPPUNIT_TEST(testTdf90627);
@@ -1524,6 +1526,26 @@ void SdOOXMLExportTest2::testBulletsAsImage()
     xDocShRef->DoClose();
 }
 
+void SdOOXMLExportTest2::testTdf115005()
+{
+    sd::DrawDocShellRef xDocShRefOriginal = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf115005.odp"), ODP);
+    utl::TempFile tempFile;
+    sd::DrawDocShellRef xDocShRefResaved = saveAndReload(xDocShRefOriginal.get(), ODP, &tempFile);
+
+    // additional checks of the output file
+    uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), tempFile.GetURL());
+
+    // check that the document contains original vector images
+    const uno::Sequence<OUString> names = xNameAccess->getElementNames();
+    int nSVMFiles = 0;
+    for (int i=0; i<names.getLength(); i++)
+    {
+        if(names[i].endsWith(".svm"))
+            nSVMFiles++;
+    }
+    CPPUNIT_ASSERT_EQUAL(3, nSVMFiles);
+}
+
 void SdOOXMLExportTest2::testTdf111789()
 {
     // Shadow properties were not exported for text shapes.
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx b/xmloff/source/core/xmlmultiimagehelper.cxx
index 6acf7b30ed28..474e796c9ad8 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -58,6 +58,10 @@ namespace
         }
 
         // vector formats, prefer always
+        if (rMimeType == "image/x-vclgraphic") // MIMETYPE_VCLGRAPHIC
+        {
+            return 990;
+        }
         if (rMimeType == "image/x-svm")
         {
             return 1000;