[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                        |    3 +
 patches/dev300/calc-xls-export-row-height-wrapped-text.diff |   21 ++++++++++++
 2 files changed, 24 insertions(+)

New commits:
commit 9dc0ff950298daa16c7ab940f74a3e5be19fe66a
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Mar 16 12:37:19 2010 -0400

    Correctly export heights of rows with wrapped text.
    
    This fixes n#580094.
    
    * patches/dev300/apply:
    * patches/dev300/calc-xls-export-row-height-wrapped-text.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 60a25a9..8cf38fe 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -958,6 +958,9 @@ calc-perf-last-rowflags-fix.diff, n#568146, kohei
 # correctly export the heights of hidden rows.
 calc-xls-export-hidden-row-height.diff, n#573938, kohei
 
+# correctly export the heights of rows with wrapped text.
+calc-xls-export-row-height-wrapped-text.diff, n#580094, kohei
+
 # fix for print selected cells functionality.
 calc-print-selected-cells-fix.diff, n#569328, kohei
 
diff --git a/patches/dev300/calc-xls-export-row-height-wrapped-text.diff b/patches/dev300/calc-xls-export-row-height-wrapped-text.diff
new file mode 100644
index 0000000..64f0d28
--- /dev/null
+++ b/patches/dev300/calc-xls-export-row-height-wrapped-text.diff
@@ -0,0 +1,21 @@
+diff --git sc/source/filter/excel/xetable.cxx sc/source/filter/excel/xetable.cxx
+index ceb708e..7493041 100644
+--- sc/source/filter/excel/xetable.cxx
++++ sc/source/filter/excel/xetable.cxx
+@@ -1835,13 +1835,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 *** ---------------------------------------------------
+