diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-05-30 17:32:45 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-05-30 22:22:20 +0200 |
commit | 0258bcdedd710d78de99c9cefc9d8c3e2ca85fdf (patch) | |
tree | d8c4a9cae97a57831bb90a25bf3d836f40478481 /include/filter | |
parent | 46ac3e24f65ee69154afa6ba93997635629f79c0 (diff) |
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 'include/filter')
-rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 41f5ce32ae0f..164c08406327 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -65,6 +65,7 @@ struct SvxMSDffShapeOrder; class SvxMSDffManager; class SfxItemSet; struct DffObjData; +class SvGlobalName; namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } @@ -735,6 +736,11 @@ public: const OUString& rPropertyName ); + /// Determines an ODF filter name (if there is one) for aGlobName. + static OUString GetFilterNameFromClassID(const SvGlobalName& aGlobName); + /// Extracts ODF data from rSrcStg. + static void ExtractOwnStream(SotStorage& rSrcStg, SvMemoryStream& rMemStream); + void insertShapeId( sal_Int32 nShapeId, SdrObject* pShape ); void removeShapeId( SdrObject const * pShape ); SdrObject* getShapeForId( sal_Int32 nShapeId ); |