sw reqif-xhtml import, embedded objects: handle non-package Ole10Native stream

Commit 800085d4fb0831f2065e86bfd99164cd89998fcd (sw reqif-xhtml import,
embedded objects: handle Ole10Native stream, 2020-05-04) added support
for handling an OLE1 stream which contained something else than OLE2
data.

However, that assumed a fixed class name ("Package") and a matching
class id. Improve this, so that the class id is created dynamically,
based on the OLE1 class name.

The class id can be figured out by putting the OLE1 data in an RTF file
and converting that RTF file to DOC using Word.

Change-Id: I1623a42a8f9b1278fd69641f1ae1ee467a6f0143
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104439
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

1 files changed, 33 insertions, 8 deletions

diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx
index 9e78acf1dc00..4d6c5dda2fea 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -18,12 +18,31 @@
 
 namespace
 {
-/// If rOle1 is native OLE1 data of size nOle1Size, wraps it in an OLE2 container.
-void WrapOle1InOle2(SvStream& rOle1, sal_uInt32 nOle1Size, SvStream& rOle2)
+/**
+ * If rOle1 is native OLE1 data of size nOle1Size, wraps it in an OLE2 container.
+ *
+ * The OLE2 root's CLSID is set based on rClassName.
+ */
+void WrapOle1InOle2(SvStream& rOle1, sal_uInt32 nOle1Size, SvStream& rOle2,
+                    const OString& rClassName)
 {
     tools::SvRef<SotStorage> pStorage = new SotStorage(rOle2);
-    // OLE Package Object
-    SvGlobalName aName(0x0003000C, 0, 0, 0xc0, 0, 0, 0, 0, 0, 0, 0x46);
+    OString aAnsiUserType;
+    SvGlobalName aName;
+    if (rClassName == "PBrush")
+    {
+        aAnsiUserType = "Bitmap Image";
+        aName = SvGlobalName(0x0003000A, 0, 0, 0xc0, 0, 0, 0, 0, 0, 0, 0x46);
+    }
+    else
+    {
+        if (!rClassName.isEmpty() && rClassName != "Package")
+        {
+            SAL_WARN("filter.ms", "WrapOle1InOle2: unexpected class name: '" << rClassName << "'");
+        }
+        aAnsiUserType = "OLE Package";
+        aName = SvGlobalName(0x0003000C, 0, 0, 0xc0, 0, 0, 0, 0, 0, 0, 0x46);
+    }
     pStorage->SetClass(aName, SotClipboardFormatId::NONE, "");
 
     // [MS-OLEDS] 2.3.7 CompObjHeader
@@ -40,14 +59,13 @@ void WrapOle1InOle2(SvStream& rOle1, sal_uInt32 nOle1Size, SvStream& rOle2)
     pCompObj->WriteUInt32(0x46000000);
     // Rest of CompObjStream
     // AnsiUserType
-    OString aAnsiUserType("OLE Package");
     pCompObj->WriteUInt32(aAnsiUserType.getLength() + 1);
     pCompObj->WriteOString(aAnsiUserType);
     pCompObj->WriteChar(0);
     // AnsiClipboardFormat
     pCompObj->WriteUInt32(0x00000000);
     // Reserved1
-    OString aReserved1("Package");
+    OString aReserved1(rClassName);
     pCompObj->WriteUInt32(aReserved1.getLength() + 1);
     pCompObj->WriteOString(aReserved1);
     pCompObj->WriteChar(0);
@@ -330,7 +348,14 @@ bool ExtractOLE2FromObjdata(const OString& rObjdata, SvStream& rOle2)
         aStream.ReadUInt32(nData); // OLEVersion
         aStream.ReadUInt32(nData); // FormatID
         aStream.ReadUInt32(nData); // ClassName
-        aStream.SeekRel(nData);
+        OString aClassName;
+        if (nData)
+        {
+            // -1 because it is null-terminated.
+            aClassName = read_uInt8s_ToOString(aStream, nData - 1);
+            // Skip null-termination.
+            aStream.SeekRel(1);
+        }
         aStream.ReadUInt32(nData); // TopicName
         aStream.SeekRel(nData);
         aStream.ReadUInt32(nData); // ItemName
@@ -354,7 +379,7 @@ bool ExtractOLE2FromObjdata(const OString& rObjdata, SvStream& rOle2)
             else
             {
                 SvMemoryStream aStorage;
-                WrapOle1InOle2(aStream, nData, aStorage);
+                WrapOle1InOle2(aStream, nData, aStorage, aClassName);
                 rOle2.WriteStream(aStorage);
             }
             rOle2.Seek(0);