summaryrefslogtreecommitdiffstats
path: root/embeddedobj
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-05-30 17:32:45 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-05-30 22:22:20 +0200
commit0258bcdedd710d78de99c9cefc9d8c3e2ca85fdf (patch)
treed8c4a9cae97a57831bb90a25bf3d836f40478481 /embeddedobj
parentmariadb-connector-c: fix Windows build (diff)
downloadcore-0258bcdedd710d78de99c9cefc9d8c3e2ca85fdf.tar.gz
core-0258bcdedd710d78de99c9cefc9d8c3e2ca85fdf.zip
sw HTML filter: handle embedded ODF content in xhtml/reqif mode
Embedded native data (what we don't parse just carry on) and real OLE2 embedding already worked, this adds the case where the actual content is ODF, just inside OLE2. The DOC import/export had support for handleing ODF content inside OLE2, so reuse that code: add new functions to SvxMSDffManager for import purposes and reuse SvxMSExportOLEObjects for export purposes. Change-Id: I0acf65d4bf29af896b8f1dd625e8672050aae350 Reviewed-on: https://gerrit.libreoffice.org/55088 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/inc/oleembobj.hxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index 59a3782fb7f4..b1f44fbbd429 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -106,6 +106,10 @@ public:
class OleComponent;
class OwnView_Impl;
+/**
+ * Represents an OLE object that has native data and we try to let an external
+ * application handle that data.
+ */
class OleEmbeddedObject : public ::cppu::WeakImplHelper
< css::embed::XEmbeddedObject
, css::embed::XEmbeddedOleObject