ooo-build r15592 - in branches/ooo-build-3-0-1: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Mar 20 16:04:30 2009
New Revision: 15592
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15592&view=rev

Log:
2009-03-20  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/chart-odf-export-correct-syntax.diff:
	* patches/dev300/apply: fixed ods export failure when the formula 
	syntax was set to either Excel A1 or R1C1.  Chart's data range was 
	not converted to Calc A1 format upon document save, because the range
	separator was still hard-coded to ';' (ugh!), causing the range parsing
	to fail. (n#487262)


Added:
   branches/ooo-build-3-0-1/patches/dev300/chart-odf-export-correct-syntax.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Fri Mar 20 16:04:30 2009
@@ -826,6 +826,7 @@
 
 # always store ranges in ODF using Calc A1 formula syntax.
 chart-odf-always-calc-a1.diff, n#463305, kohei
+chart-odf-export-correct-syntax.diff, n#487262, kohei
 
 # fixed change track export to xls files wrt cell change records.
 calc-change-track-xls-export-fix.diff, n#416045, i#93839, kohei

Added: branches/ooo-build-3-0-1/patches/dev300/chart-odf-export-correct-syntax.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/chart-odf-export-correct-syntax.diff	Fri Mar 20 16:04:30 2009
@@ -0,0 +1,22 @@
+diff --git sc/source/ui/unoobj/chart2uno.cxx sc/source/ui/unoobj/chart2uno.cxx
+index 62597a1..a57a500 100644
+--- sc/source/ui/unoobj/chart2uno.cxx
++++ sc/source/ui/unoobj/chart2uno.cxx
+@@ -44,6 +44,7 @@
+ #include "hints.hxx"
+ #include "unoreflist.hxx"
+ #include "chartlis.hxx"
++#include "compiler.hxx"
+ 
+ #include <sfx2/objsh.hxx>
+ 
+@@ -1042,7 +1043,8 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const rtl::OUStr
+     if( m_pDocument )
+     {
+         ScRangeList aList;
+-        if( !ScRangeStringConverter::GetRangeListFromString(aList, sRangeRepresentation, m_pDocument, m_pDocument->GetAddressConvention(), ';'))
++        sal_Unicode sep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
++        if( !ScRangeStringConverter::GetRangeListFromString(aList, sRangeRepresentation, m_pDocument, m_pDocument->GetAddressConvention(), sep))
+             throw lang::IllegalArgumentException();
+         ScRangeStringConverter::GetStringFromRangeList(sRet, &aList, m_pDocument, ScAddress::CONV_OOO);
+     }