vcl/source/filter/graphicfilter.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 8051bdea4fa3fc75f9cb08facf79e64a24cd8bd9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Aug 23 14:10:57 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Aug 23 17:57:52 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/59503
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 3a96985879cc..fac71cecaf1c 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1668,11 +1668,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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
