[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - xmloff/source

[Serge Krot]

 xmloff/source/core/xmlmultiimagehelper.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 806ed2819092ee4f7535b3cd331c5203b30e2ec7
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.
    
    Reviewed-on: https://gerrit.libreoffice.org/51599
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    
    Conflicts:
            sd/qa/unit/export-tests-ooxml2.cxx
            xmloff/source/core/xmlmultiimagehelper.cxx
    
    Change-Id: I7c723e99995f73258bb59d976a6c7670c51f7a25
    Reviewed-on: https://gerrit.libreoffice.org/51655
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/51971
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx b/xmloff/source/core/xmlmultiimagehelper.cxx
index a525831e88a9..f4acb53456bb 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -64,6 +64,10 @@ namespace
         }
 
         // vector formats, prefer always
+        if(sMimeType == "image/x-vclgraphic") // MIMETYPE_VCLGRAPHIC
+        {
+            return 990;
+        }
         if(sMimeType == "image/x-svm")
         {
             return 1000;