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

Stephan Bergmann sbergman at redhat.com
Mon Feb 27 13:30:25 UTC 2017


 tools/source/ref/pstm.cxx |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit b100342d42a15a3aed79d6f23ecfd0b56e4a86bf
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 27 14:25:42 2017 +0100

    Remove odd check that writeUInt32 indeed writes four bytes
    
    If you look at the oldest available version of SvPersistStream::WriteDummyLen in
    8ab086b6cc054501bfbf7ef6fa509c393691e860 "initial import", it looks like there
    was an issue with whetever earlier way was used to reserve a four-byte space in
    the stream with "Sun sp" (whatever that shall mean).
    
    Change-Id: I861a445ae72f1ced502f70917707336eb5dddf04

diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index 4bd0d80..3a7435d 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -244,17 +244,7 @@ void SvPersistStream::WriteCompressed( SvStream & rStm, sal_uInt32 nVal )
 */
 sal_uInt32 SvPersistStream::WriteDummyLen()
 {
-#ifdef DBG_UTIL
-    sal_uInt32 nPos = Tell();
-#endif
-    sal_uInt32 n0 = 0;
-    WriteUInt32( n0 ); // Because of Sun sp
-    // Don't assert on stream error
-#ifdef DBG_UTIL
-    DBG_ASSERT( GetError() != SVSTREAM_OK
-                  || (sizeof( sal_uInt32 ) == Tell() -nPos),
-                "No 4 byte as length parameter" );
-#endif
+    WriteUInt32( 0 );
     return Tell();
 }
 


More information about the Libreoffice-commits mailing list