[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Muthu Subramanian]

 sc/source/filter/excel/impop.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit cb010c378dfb60fa82a3dfbcd1bcd20e5b26df48
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Thu Dec 15 16:49:52 2011 +0530

    fdo#33747: Row Height is unnecessarily large.

diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 3c96481..533bbb9 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -937,6 +937,10 @@ void ImportExcel::Row34( void )
         aIn >> nRowHeight;  // direkt in Twips angegeben
         aIn.Ignore( 4 );
 
+        nRowHeight = nRowHeight & 0x7FFF; // Bit 15: Row Height not changed manually
+        if( !nRowHeight )
+            nRowHeight = (GetBiff() == EXC_BIFF2) ? 0x25 : 0x225;
+
         aIn >> nGrbit >> nXF;
 
         sal_uInt8 nLevel = ::extract_value< sal_uInt8 >( nGrbit, 0, 3 );