diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-07 16:49:58 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-04 18:08:20 +0200 |
commit | 76abcd5f912f1a9e6f86ffc2a489ba7dba1aac56 (patch) | |
tree | ded6e260c003a5e15e02c85b65516c5890d46146 /include | |
parent | efa1d0df9a108b585bddd0a7e8ba5a4f64df3489 (diff) |
sw HTML export: use PNG fallback + RTF native data for all images for ReqIF
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
Diffstat (limited to 'include')
-rw-r--r-- | include/filter/msfilter/rtfutil.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx index 1cadaa94bd50..58aa4d54addf 100644 --- a/include/filter/msfilter/rtfutil.hxx +++ b/include/filter/msfilter/rtfutil.hxx @@ -70,6 +70,9 @@ MSFILTER_DLLPUBLIC OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, * Extract OLE2 data from an \objdata hex dump. */ MSFILTER_DLLPUBLIC bool ExtractOLE2FromObjdata(const OString& rObjdata, SvStream& rOle2); + +/// Strips the header of a WMF file. +MSFILTER_DLLPUBLIC bool StripMetafileHeader(const sal_uInt8*& rpGraphicAry, sal_uInt64& rSize); } } |