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

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Tue Oct 6 10:50:36 UTC 2020


 oox/source/ole/vbaexport.cxx |   16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

New commits:
commit 97c03dfe6c946236c3b385879f3bb2594dc4602f
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue Oct 6 11:20:08 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Tue Oct 6 12:49:51 2020 +0200

    Drop unused code
    
    ... a leftover in commit 3187eeab10df77a6c0dd6397be993a68276d7141,
    copypasted in commit 4f4a668e04bdd68655a0f574027f486cea953857.
    
    Change-Id: I7a634ba432cb4736ec85a420b0f77288cd1e0802
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104004
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index 7833beae83cd..b699da60697a 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -762,20 +762,13 @@ void exportDirStream(SvStream& rStrm, const css::uno::Reference<css::container::
     aDirStream.WriteUInt16(0x0010); // terminator
     aDirStream.WriteUInt32(0x00000000); // reserved
 
-    aDirStream.Seek(0);
-
 #if VBA_EXPORT_DEBUG
     const OUString aDirFileName("/tmp/vba_dir_out.bin");
     SvFileStream aDirStreamDebug(aDirFileName, StreamMode::READWRITE);
-
-    aDirStreamDebug.WriteStream(aDirStream);
     aDirStream.Seek(0);
+    aDirStreamDebug.WriteStream(aDirStream);
 #endif
 
-    // the stream for the compression
-    SvMemoryStream aMemoryStream(4096, 4096);
-    aMemoryStream.WriteStream(aDirStream);
-
     VBACompression aCompression(rStrm, aDirStream);
     aCompression.write();
 }
@@ -807,19 +800,14 @@ void exportModuleStream(SvStream& rStrm, const OUString& rSourceCode, const OUSt
         aSourceCode = aSourceCode.replaceAt(nPos, nEndPos - nPos+1, "");
     aSourceCode = aSourceCode.replaceAll("\n", "\r\n");
     exportString(aModuleStream, aSourceCode);
-    aModuleStream.Seek(0);
 
 #if VBA_EXPORT_DEBUG
     OUString aModuleFileName("/tmp/vba_" + aElementName + "_out.bin");
     SvFileStream aModuleStreamDebug(aModuleFileName, StreamMode::READWRITE);
-    aModuleStreamDebug.WriteStream(aModuleStream);
     aModuleStream.Seek(0);
+    aModuleStreamDebug.WriteStream(aModuleStream);
 #endif
 
-    // the stream for the compression
-    SvMemoryStream aMemoryStream(4096, 4096);
-    aMemoryStream.WriteStream(aModuleStream);
-
     VBACompression aCompression(rStrm, aModuleStream);
     aCompression.write();
 }


More information about the Libreoffice-commits mailing list