diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-01 16:55:37 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-02 09:03:17 +0200 |
| commit | d95f50689f915b92211714495e866e2f47909f11 (patch) | |
| tree | 633bc92ee4715802e5290bd24569c5c21bbc0f5c | |
| parent | 6664c1fc92bcf9a7fa9f66896a65bc1b44bdab37 (diff) | |
tdf#70415 PPTX import: fix assert fail in importEmbeddedGraphics()
The intention for the parallel import is that the number of input and
output arguments is always the same. On error just empty references are
returned.
That means we should not check for empty references here, otherwise the
input and output length won't equal.
Change-Id: Ief86162e7f827bc413c4dde4a4c9f606a83ea803
Reviewed-on: https://gerrit.libreoffice.org/38316
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | oox/source/helper/graphichelper.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index 692937baeb48..30c570b01eec 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -271,14 +271,11 @@ std::vector< uno::Reference<graphic::XGraphic> > GraphicHelper::importGraphics(c for (const auto& rStream : rStreams) { - if (rStream.is()) + uno::Sequence<beans::PropertyValue > aArgs = comphelper::InitPropertySequence( { - uno::Sequence<beans::PropertyValue > aArgs = comphelper::InitPropertySequence( - { - {"InputStream", uno::makeAny(rStream)} - }); - aArgsVec.push_back(aArgs); - } + {"InputStream", uno::makeAny(rStream)} + }); + aArgsVec.push_back(aArgs); } std::vector< uno::Reference<graphic::XGraphic> > aRet; |