[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/filter/graphicfilter.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit eaa1396573e25e8c52cb452e2b2471b9bdbd3c0f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 23 14:10:57 2018 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Thu Aug 23 19:07:37 2018 +0200

    Resolves: tdf#118659 eps not shown
    
    since...
    
    commit 7b355669c6ddeab2e6cec692d6afdff41c61d0fb
    Date:   Sat Apr 14 15:13:05 2018 +0900
    
        Function to load graphic swapped out (loaded on demand)
    
    new function doesn't load the eps, so supposed to fall back
    to the old function, but the new function didn't leave
    the stream at its original position on failing to attempt
    the load
    
    Change-Id: I960574722687cf5ad8c78be7339d2ce6b74397a9
    Reviewed-on: https://gerrit.libreoffice.org/59504
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 870c5586ea82..072c1c31e5c8 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1667,11 +1667,10 @@ Graphic GraphicFilter::ImportUnloadedGraphic(SvStream& rIStream)
     }
 
     // Set error code or try to set native buffer
-    if(nStatus != ERRCODE_NONE)
-    {
+    if (nStatus != ERRCODE_NONE)
         ImplSetError(nStatus, &rIStream);
+    if (nStatus != ERRCODE_NONE || eLinkType == GfxLinkType::NONE)
         rIStream.Seek(nStreamBegin);
-    }
 
     return aGraphic;
 }