oox/source/export/chartexport.cxx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
New commits: commit 277e9c5159635d131502372ff4f9cf719e7d3845 Author: Eike Rathke <[email protected]> AuthorDate: Thu Nov 15 13:27:10 2018 +0100 Commit: Markus Mohrhard <[email protected]> CommitDate: Fri Nov 16 13:19:32 2018 +0100 Resolves: tdf#121260 do not force AddressConvention::OOO on parseFormula() Change-Id: I48b8295fc75e40f5d58f99fc2809c28de48771d5 Reviewed-on: https://gerrit.libreoffice.org/63417 Reviewed-by: Eike Rathke <[email protected]> Tested-by: Jenkins (cherry picked from commit 7997c12d01e03a719d9aa262cc55bc415b592ff7) Reviewed-on: https://gerrit.libreoffice.org/63428 Reviewed-by: Markus Mohrhard <[email protected]> diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 43fe63a51554..e94a7145357a 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -409,10 +409,16 @@ OUString ChartExport::parseFormula( const OUString& rRange ) if( xParser.is() ) { Reference< XPropertySet > xParserProps( xParser, uno::UNO_QUERY ); - if( xParserProps.is() ) - { - xParserProps->setPropertyValue("FormulaConvention", uno::makeAny(css::sheet::AddressConvention::OOO) ); - } + // rRange is the result of a + // css::chart2::data::XDataSequence::getSourceRangeRepresentation() + // call that returns the range in the document's current UI notation. + // Creating a FormulaParser defaults to the same notation, for + // parseFormula() do not attempt to override the FormulaConvention + // property with css::sheet::AddressConvention::OOO or some such. + /* TODO: it would be much better to introduce a + * getSourceRangeRepresentation(css::sheet::AddressConvention) to + * return the ranges in a specific convention than converting them with + * the overhead of creating an XFormulaParser for each.. */ uno::Sequence<sheet::FormulaToken> aTokens = xParser->parseFormula( rRange, CellAddress( 0, 0, 0 ) ); if( xParserProps.is() ) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
