summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@suse.com>2011-12-15 16:49:52 +0530
committerMuthu Subramanian <sumuthu@suse.com>2011-12-15 16:49:52 +0530
commit9dab9a26aeaeeaabcef3f4900597ca57e7411a2d (patch)
tree45d14fd0e981b77d4773c4ff3065ac26994d15c7 /sc
parentaee15f3f1cc5fa0ee23ac5f1344a193ed72f84f3 (diff)
fdo#33747: Row Height is unnecessarily large.
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/excel/impop.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 3c9648107405..533bbb9173ad 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 );