diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-09 09:24:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-09 09:25:10 +0100 |
| commit | 8db9cfd2973b3e6f0c682fe8961540d528e6d493 (patch) | |
| tree | bced53bb86429f71ba94f924a24b7bbf168054e6 /embeddedobj/source | |
| parent | 693528ffd44d9aaa44f9fcf22670246dc8adca77 (diff) | |
Related: tdf#62702 handle EmbeddedOdf like CONTENTS on ole activate attempt
Change-Id: I11f1d6ad049cada1cadfe97a440b7ae562ba4ced
Diffstat (limited to 'embeddedobj/source')
| -rw-r--r-- | embeddedobj/source/msole/oleembed.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index e5bd8646aac9..fd9bb68ecc1c 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -715,6 +715,19 @@ namespace } bool bCopied = xCONTENTS.is() && lcl_CopyStream(xCONTENTS->getInputStream(), xStream->getOutputStream()); + if (!bCopied) + { + uno::Reference< io::XStream > xEmbeddedOdf; + try + { + xNameContainer->getByName("EmbeddedOdf") >>= xEmbeddedOdf; + } + catch (container::NoSuchElementException const&) + { + // ignore + } + bCopied = xEmbeddedOdf.is() && lcl_CopyStream(xEmbeddedOdf->getInputStream(), xStream->getOutputStream()); + } if (!bCopied) { |