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

1 files changed, 16 insertions, 0 deletions

diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx
index ad2031d5536f..4ff71330b85c 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -285,6 +285,22 @@ bool ExtractOLE2FromObjdata(const OString& rObjdata, SvStream& rOle2)
 
     return true;
 }
+
+bool StripMetafileHeader(const sal_uInt8*& rpGraphicAry, sal_uInt64& rSize)
+{
+    if (rpGraphicAry && (rSize > 0x22))
+    {
+        if ((rpGraphicAry[0] == 0xd7) && (rpGraphicAry[1] == 0xcd) && (rpGraphicAry[2] == 0xc6)
+            && (rpGraphicAry[3] == 0x9a))
+        {
+            // we have to get rid of the metafileheader
+            rpGraphicAry += 22;
+            rSize -= 22;
+            return true;
+        }
+    }
+    return false;
+}
 }
 }