ooo-build r14423 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Oct 28 19:30:12 2008
New Revision: 14423
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14423&view=rev

Log:
2008-10-28  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-xls-disable-adjust-row-height.diff: disable the
	call to calculate row heights at the end of xls file import.  Row 
	heights are already given in the file so let's use them.  This speeds
	up file load speed considerably & better preserves document layout.

	* patches/dev300/apply: apply this new patch.


Added:
   trunk/patches/dev300/calc-xls-disable-adjust-row-height.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Oct 28 19:30:12 2008
@@ -820,6 +820,10 @@
 # Don't insert drill-down sheet in read-only mode.
 calc-dp-no-drilldown-when-readonly.diff, i#90402, kohei
 
+# Don't adjust row height on xls load for better layout preservation and 
+# faster file load.
+calc-xls-disable-adjust-row-height.diff, kohei
+
 [ CalcFixes < ooo300-m3 ]
 # Fix a regression on filtering by page field.
 calc-fix-datapilot-date-filter.diff, i#90022, kohei

Added: trunk/patches/dev300/calc-xls-disable-adjust-row-height.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/calc-xls-disable-adjust-row-height.diff	Tue Oct 28 19:30:12 2008
@@ -0,0 +1,17 @@
+diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx
+index a868e17..e3e7ecd 100644
+--- sc/source/filter/excel/read.cxx
++++ sc/source/filter/excel/read.cxx
+@@ -1171,7 +1171,12 @@ FltError ImportExcel8::Read( void )
+ 
+         pProgress.reset();
+ 
++#if 0
++        // Excel documents look much better without this call; better in the
++        // sense that the row heights are identical to the original heights in
++        // Excel.
+         AdjustRowHeight();
++#endif
+         PostDocLoad();
+ 
+         pD->CalcAfterLoad();