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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Dec 24 21:37:32 2008
New Revision: 14924
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14924&view=rev

Log:
2008-12-24  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/chart-odf-export-assert-removal.diff: don't incorrectly
	export color values as number formats, and don't raise an assertion on
	data point count when the content export is not requested (which means
	the data point count remains zero). (i#97563)

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


Added:
   trunk/patches/dev300/chart-odf-export-assert-removal.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Dec 24 21:37:32 2008
@@ -1887,6 +1887,9 @@
 calc-grammar-xls-english-offapi.diff, kohei
 calc-grammar-xls-english-sc.diff, kohei
 
+# fix assertions to prevent them from being incorrectly triggered.
+chart-odf-export-assert-removal.diff, i#97563, kohei
+
 [ CalcRowLimit ]
 # The work to increase Calc's row size limit, and any work associated with it.
 SectionOwner => kohei

Added: trunk/patches/dev300/chart-odf-export-assert-removal.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/chart-odf-export-assert-removal.diff	Wed Dec 24 21:37:32 2008
@@ -0,0 +1,38 @@
+Index: xmloff/source/chart/SchXMLExport.cxx
+===================================================================
+--- xmloff/source/chart/SchXMLExport.cxx	(revision 265799)
++++ xmloff/source/chart/SchXMLExport.cxx	(working copy)
+@@ -3057,12 +3057,14 @@
+             {
+                 aPropertyStates.clear();
+                 uno::Reference< beans::XPropertySet > xPropSet;
++                bool bExportNumFmt = false;
+                 if( aAttrPointSet.find( nElement ) != aEndIt )
+                 {
+                     try
+                     {
+                         xPropSet = SchXMLSeriesHelper::createOldAPIDataPointPropertySet(
+                                     xSeries, nElement, mrExport.GetModel() );
++                        bExportNumFmt = true;
+                     }
+                     catch( uno::Exception & rEx )
+                     {
+@@ -3081,7 +3083,7 @@
+                 if( xPropSet.is())
+                 {
+                     const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() );
+-                    if( nCurrentODFVersion >= SvtSaveOptions::ODFVER_012 )
++                    if( nCurrentODFVersion >= SvtSaveOptions::ODFVER_012 && bExportNumFmt )
+                     {
+                         lcl_exportNumberFormat( sNumFormat, xPropSet, mrExport );
+                         lcl_exportNumberFormat( sPercentageNumFormat, xPropSet, mrExport );
+@@ -3107,7 +3109,8 @@
+                     }
+                 }
+             }
+-            DBG_ASSERT( static_cast<sal_Int32>(aDataPointList.size()) == nSeriesLength, "not enough data points" );
++            DBG_ASSERT( !bExportContent || (static_cast<sal_Int32>(aDataPointList.size()) == nSeriesLength), 
++                        "not enough data points on content export" );
+         }
+         else
+         {