[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - oox/inc

David Tardon dtardon at redhat.com
Mon Jun 24 04:59:34 PDT 2013


 oox/inc/oox/helper/binaryoutputstream.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac4a743dd901aed6e83b00cd7f8a99eb6618bd3a
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jun 24 13:31:27 2013 +0200

    convert the right number of elements
    
    (cherry picked from commit e3a8e4f221fca5f67f4d6caf17f3bec39b13e3d5)
    
    Signed-off-by: David Tardon <dtardon at redhat.com>
    
    Conflicts:
    	include/oox/helper/binaryoutputstream.hxx
    
    Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c
    Reviewed-on: https://gerrit.libreoffice.org/4478
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/oox/inc/oox/helper/binaryoutputstream.hxx b/oox/inc/oox/helper/binaryoutputstream.hxx
index 773f0d0..15d1de4 100644
--- a/oox/inc/oox/helper/binaryoutputstream.hxx
+++ b/oox/inc/oox/helper/binaryoutputstream.hxx
@@ -93,7 +93,7 @@ template< typename Type >
 void BinaryOutputStream::writeArray( Type* opnArray, sal_Int32 nElemCount )
 {
     sal_Int32 nWriteSize = getLimitedValue< sal_Int32, sal_Int32 >( nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type );
-    ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast< size_t >( nWriteSize ) );
+    ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast< size_t >( nElemCount ) );
     writeMemory( opnArray, nWriteSize, sizeof( Type ) );
 }
 


More information about the Libreoffice-commits mailing list