summaryrefslogtreecommitdiff
path: root/sw/source/filter/html/htmlreqifreader.hxx
AgeCommit message (Collapse)AuthorFilesLines
2018-11-15sw reqif-xhtml export: write graphic of OLE object at an RTF level as wellMiklos Vajna1-1/+2
An embedded object have have its replacement graphic at 3 levels in reqif-xhtml: PNG at HTML level, WMF at RTF level and as a stream in the OLE2 storage. Some reqif readers depend on having the replacement graphic at an RTF level, so write that variant, too. Change-Id: I3391303248d2792a4c370e8fc84db0f22185312e Reviewed-on: https://gerrit.libreoffice.org/63419 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2018-07-13sw, writerfilter: various small cleanupsMiklos Vajna1-1/+1
Different parameter name in declaration and definition, repeating type name inside the very same line when initializing from a cast, and so on. Change-Id: I52dc29ed845fb1a780dfab586bfd67db0d4a9e54 Reviewed-on: https://gerrit.libreoffice.org/57370 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-07-04sw HTML export: use PNG fallback + RTF native data for all images for ReqIFMiklos Vajna1-0/+9
ReqIF says the image should be either PNG or has a PNG fallback and then it can be something else. We used to convert images to PNG to avoid writing any native data, but results in data loss. So instead: 1) Write the original image as an RTF fragment, so it's not lost. 2) Some ReqIF parsers expect an RTF fragment even for PNG, so make sure we always write the RTF fragment, even if that means a small duplication. Change-Id: Ida0fcaa58d56b9e11f81992307505599807353b5 Reviewed-on: https://gerrit.libreoffice.org/55430 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins
2018-05-30sw HTML filter: handle embedded ODF content in xhtml/reqif modeMiklos Vajna1-2/+6
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>
2018-03-27sw XHTML export: support OLE2-in-RTF objectsMiklos Vajna1-0/+3
Need to repeat what OLE1 calls the class name in the OLE1 and RTF wrappers, so parse our own OLE2 data during export. Change-Id: Ic14fa648d1f78c29579bd9ba49ce6f491d4541b5 Reviewed-on: https://gerrit.libreoffice.org/51906 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-23sw XHTML import: support OLE2-in-RTF objectsMiklos Vajna1-0/+22
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>