diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-23 10:58:46 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-23 14:52:50 +0100 |
commit | 781c1181718c295e0f7c0c2169d0f6d539f685df (patch) | |
tree | 2ed6621d454e0221e709609c85dddb657adbb016 /sw/Library_sw.mk | |
parent | 1b1cfe4837ee7776317f63bb92edcee2d1903b9c (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 'sw/Library_sw.mk')
-rw-r--r-- | sw/Library_sw.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 7ca75085cc74..f70ef0b76b27 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -521,6 +521,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/filter/html/htmlnumreader \ sw/source/filter/html/htmlnumwriter \ sw/source/filter/html/htmlplug \ + sw/source/filter/html/htmlreqifreader \ sw/source/filter/html/htmlsect \ sw/source/filter/html/htmltab \ sw/source/filter/html/htmltabw \ |