[Libreoffice-commits] core.git: filter/source

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 29 11:58:23 UTC 2021


 filter/source/msfilter/rtfutil.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f31955add694f52add574b94ab181be3d388e832
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Jun 29 11:55:09 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Jun 29 13:57:50 2021 +0200

    filter: remove rReserved1 completely in WrapOle1InOle2()
    
    The comment above already states that this the Reserved1 field in the
    spec, so there is no value in the additional reference.
    
    Change-Id: I48bdda04ab536461a1eb5818df6a610f41d5fe95
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118078
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx
index 633a6df03dc1..67507e4c3a05 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -65,9 +65,8 @@ void WrapOle1InOle2(SvStream& rOle1, sal_uInt32 nOle1Size, SvStream& rOle2,
     // AnsiClipboardFormat
     pCompObj->WriteUInt32(0x00000000);
     // Reserved1
-    const OString& rReserved1(rClassName);
-    pCompObj->WriteUInt32(rReserved1.getLength() + 1);
-    pCompObj->WriteOString(rReserved1);
+    pCompObj->WriteUInt32(rClassName.getLength() + 1);
+    pCompObj->WriteOString(rClassName);
     pCompObj->WriteChar(0);
     // UnicodeMarker
     pCompObj->WriteUInt32(0x71B239F4);


More information about the Libreoffice-commits mailing list