sc/source/core/tool/rangeutl.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
New commits: commit d598c76cb9f34aad83802450cc4d607b71792eb8 Author: Kohei Yoshida <kohei.yosh...@suse.com> Date: Thu Dec 8 21:37:10 2011 -0500 bnc#727504: Correctly convert chart data ranges. We were supported to convert XML chart data range representations with a hard-coded ';' as the range union operators, but incorrectly using UI configurable range separators. This caused charts with series that consisted of multiple ranges to be imported correctly in locales where the range separator (which re-uses the function argument separator) was something other than ';'. BTW I plan to remove this "always use Calc A1 syntax" restriction in future versions. diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index fda7615..5e1db5d 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -898,8 +898,7 @@ static void lcl_appendCellRangeAddress( void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, const OUString& rXMLRange, ScDocument* pDoc ) { FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - const OUString aRangeSep = ScCompiler::GetNativeSymbol(ocSep); - const sal_Unicode cSep = ' '; + const sal_Unicode cSep = ' ', cSepNew = ';'; const sal_Unicode cQuote = '\''; OUStringBuffer aRetStr; @@ -984,7 +983,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con if (bFirst) bFirst = false; else - aRetStr.append(aRangeSep); + aRetStr.append(cSepNew); lcl_appendCellRangeAddress(aRetStr, pDoc, aCell1, aCell2, aExtInfo1, aExtInfo2); } @@ -1006,7 +1005,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con if (bFirst) bFirst = false; else - aRetStr.append(aRangeSep); + aRetStr.append(cSepNew); lcl_appendCellAddress(aRetStr, pDoc, aCell, aExtInfo); } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits