summaryrefslogtreecommitdiff
path: root/embeddedobj/source/msole/olemisc.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-03-23 10:58:46 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-03-23 14:52:50 +0100
commit781c1181718c295e0f7c0c2169d0f6d539f685df (patch)
tree2ed6621d454e0221e709609c85dddb657adbb016 /embeddedobj/source/msole/olemisc.cxx
parent1b1cfe4837ee7776317f63bb92edcee2d1903b9c (diff)
sw XHTML import: support OLE2-in-RTF objects
If you like layering things on top of each other, then this commit message is for you. So it's possible to have a PPTX file in the following wrappers: - wrap PPTX in a binary OLE2 container - wrap that in an OLE1 container - wrap that in an RTF fragment - wrap that in an XHTML fragment (in a ReqIF file) Turns out that only the RTF and OLE1 unwrapping was missing, the rest worked already, so implement the missing piece in a new SwReqIfReader namespace. Finally extend OleEmbeddedObject to be able to read its native data stream when the object is opened, reading it from the storage would fail, as the object already opened the storage stream. Change-Id: I2934c9fb7474e981ff6bb2f7eb253a3a86cfd98b Reviewed-on: https://gerrit.libreoffice.org/51772 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'embeddedobj/source/msole/olemisc.cxx')
-rw-r--r--embeddedobj/source/msole/olemisc.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index ad348f468c98..4ae70b745a7a 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -670,4 +670,14 @@ void SAL_CALL OleEmbeddedObject::setParent( const css::uno::Reference< css::uno:
m_xParent = xParent;
}
+void OleEmbeddedObject::setStream(const css::uno::Reference<css::io::XStream>& xStream)
+{
+ m_xObjectStream = xStream;
+}
+
+css::uno::Reference<css::io::XStream> OleEmbeddedObject::getStream()
+{
+ return m_xObjectStream;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */