diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2009-03-20 15:10:19 +0000 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2009-03-20 15:10:19 +0000 |
| commit | 868035254f3ce6e7e56e376a297b2b1673c03873 (patch) | |
| tree | 1ce952430809d0a0882fa7abbe8fbb2141a3463d | |
| parent | b151f2385d6a34a1e7762ceaeffd6134bb06dfe1 (diff) | |
Fixed ods export failure when the formula syntax was set to either Excel A1 or R1C1.OPENSUSE-11-1-GIT
* 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)
| -rw-r--r-- | patches/dev300/apply | 1 | ||||
| -rw-r--r-- | patches/dev300/chart-odf-export-correct-syntax.diff | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index d0d0598cc..7c4bc7455 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -797,6 +797,7 @@ chart-wizard-xls-address-convention-fix.diff, n#411450, i#94696, kohei # 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 diff --git a/patches/dev300/chart-odf-export-correct-syntax.diff b/patches/dev300/chart-odf-export-correct-syntax.diff new file mode 100644 index 000000000..16cf3c669 --- /dev/null +++ b/patches/dev300/chart-odf-export-correct-syntax.diff @@ -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); + } |