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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Nov 18 22:05:13 2008
New Revision: 14535
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14535&view=rev

Log:
2008-11-18  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-dp-pivotcache-fix.diff: fixed pivot cache field 
	import.  There are times when the SXFIELD record says no items but they
	are present.  Proceed even if the item count is zero, if the postponed
	flag is set (n#433658).

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


Added:
   trunk/patches/dev300/calc-dp-pivotcache-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Nov 18 22:05:13 2008
@@ -850,6 +850,9 @@
 # Fix a typo in chart2 that causes incorrect scaling under certain conditions.
 chart-maximum-minimum-typo.diff, i#95714, kohei
 
+# Pivot cache field import fix.
+calc-dp-pivotcache-fix.diff, n#433658, kohei
+
 [ CalcFixes < ooo300-m3 ]
 # Fix a regression on filtering by page field.
 calc-fix-datapilot-date-filter.diff, i#90022, kohei
@@ -2527,7 +2530,7 @@
 
 
 [ Fixes ]
-sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
+#sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
 
 [ Glib2 ]
 external-package-glib2.diff

Added: trunk/patches/dev300/calc-dp-pivotcache-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/calc-dp-pivotcache-fix.diff	Tue Nov 18 22:05:13 2008
@@ -0,0 +1,15 @@
+diff --git sc/source/filter/excel/xipivot.cxx sc/source/filter/excel/xipivot.cxx
+index 49d35d1..90a5667 100644
+--- sc/source/filter/excel/xipivot.cxx
++++ sc/source/filter/excel/xipivot.cxx
+@@ -286,9 +286,8 @@ void XclImpPCField::ReadSxfield( XclImpStream& rStrm )
+     // for now, ignore data type of calculated fields
+     DBG_ASSERT( bCalced || bType || bTypeNone, "XclImpPCField::ReadSxfield - unknown item data type" );
+ 
+-    if( nVisC > 0 )
++    if( nVisC > 0 || bPostp )
+     {
+-        DBG_ASSERT( !bItems || !bPostp, "XclImpPCField::ReadSxfield - postponed field with inline items" );
+         if( bItems && !bPostp )
+         {
+             if( !bCalced )