diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-05-28 16:02:50 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-05-31 10:04:24 +0200 |
| commit | 7a5717cb8ad4c6b30d46ad86326fa4274bd84f12 (patch) | |
| tree | e6aa11c06d406b694cb5e5e50dc77ba6f6fab2d8 /sw/qa | |
| parent | ffbf6916e2bd7de4daa862e11e52c9ff24929260 (diff) | |
sw XHTML / reqif export, RTF markup of images: write OLE1 presentation data
With this, images are exported as PBrush OLE objects, to please some
consumers (e.g. IBM Doors).
(cherry picked from commit 5fbd20682f34c817359156889ecbc3ad8290d72c)
Conflicts:
sw/source/filter/html/htmlreqifreader.cxx
Change-Id: I89805cd66709d96cbe71853d65671f76a3fc871f
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/htmlexport/htmlexport.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 5074c5e54e0d..50e001c72890 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -152,11 +152,6 @@ OLE1Reader::OLE1Reader(SvStream& rStream) rStream.ReadUInt32(m_nNativeDataSize); rStream.SeekRel(m_nNativeDataSize); - if (!rStream.remainingSize()) - { - return; - } - rStream.ReadUInt32(nData); // OLEVersion for presentation data CPPUNIT_ASSERT(rStream.good()); rStream.ReadUInt32(nData); // FormatID @@ -1492,6 +1487,11 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifImageToOle) // Without the accompanying fix in place, this test would have failed, as aOle1 was empty. OLE1Reader aOle1Reader(aOle1); CPPUNIT_ASSERT(aOle1Reader.m_nNativeDataSize); + + // Make sure that the presentation data byte array is not empty. + // Without the accompanying fix in place, this test would have failed, as aOle1 only contained + // the native data. + CPPUNIT_ASSERT(aOle1Reader.m_nPresentationDataSize); } CPPUNIT_PLUGIN_IMPLEMENT(); |