Skip to content

C
core
Kaydet (Commit) 8db9cfd2 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

Related: tdf#62702 handle EmbeddedOdf like CONTENTS on ole activate attempt 

Change-Id: I11f1d6ad049cada1cadfe97a440b7ae562ba4ced
üst 693528ff
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
embeddedobj/source/msole/oleembed.cxx
Dosyayı görüntüle @ 8db9cfd2
...@@ -715,6 +715,19 @@ namespace ...@@ -715,6 +715,19 @@ namespace
} }
bool bCopied = xCONTENTS.is() && lcl_CopyStream(xCONTENTS->getInputStream(), xStream->getOutputStream()); 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) if (!bCopied)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment