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

[Libreoffice Gerrit user]

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

New commits:
commit 73f95c17bc6e295e364d777c29a6f0cd4d3c71a6
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Wed Sep 19 12:51:00 2018 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Sep 21 12:58:15 2018 +0200

    tdf#118502 Fix loading of eps images with replacement graphic
    
    Reviewed-on: https://gerrit.libreoffice.org/60752
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 088af44063c3e2d1d0e7744a9f9bd7b37ff58a75)
    
    Change-Id: Iaf9c8e2ed72115e1f82d2541ae2a1d4803795a46
    Reviewed-on: https://gerrit.libreoffice.org/60814
    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 06383283f542..447d2ea2675b 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -75,6 +75,10 @@ namespace
         {
             return 1020;
         }
+        if(sMimeType == "image/x-eps")
+        {
+            return 1025;
+        }
         if(sMimeType == "application/pdf")
         {
             return 1030;