[ooo-build-commit] .: sc/source

[Kohei Yoshida]

 sc/source/filter/excel/xetable.cxx |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 2f9832ae58e684a49e03d7c0eaa38f6d55832d4a
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Sep 28 15:02:47 2010 -0400

    Ported calc-xls-export-row-height-wrapped-text.diff from ooo-build.

diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 9644976..dfed546 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -1832,13 +1832,10 @@ XclExpRow::XclExpRow( const XclExpRoot& rRoot, sal_uInt16 nXclRow,
 
     // *** Row height *** -----------------------------------------------------
 
-    if (bUserHeight)
-        mnHeight = GetDoc().GetRowHeight(nScRow, nScTab, false);
-    else
-        mnHeight = EXC_ROW_DEFAULTHEIGHT;
+    // Always get the actual row height even if the manual size flag is not set,
+    // to correctly export the heights of rows with wrapped texts.
 
-    // #76250# not usable in Applix
-//    ::set_flag( mnHeight, EXC_ROW_FLAGDEFHEIGHT, !bUserHeight );
+    mnHeight = GetDoc().GetRowHeight(nScRow, nScTab, false);
 
     // *** Outline data *** ---------------------------------------------------