diff options
| author | Eike Rathke <erack@redhat.com> | 2018-11-15 13:27:10 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-11-16 13:19:32 +0100 |
| commit | 277e9c5159635d131502372ff4f9cf719e7d3845 (patch) | |
| tree | 20bf5ddddea77b97241024865a9b0fd3a64e81b5 /oox | |
| parent | 9a43f68475363aa3d242e97e0e8e0da32f21288a (diff) | |
Resolves: tdf#121260 do not force AddressConvention::OOO on parseFormula()
Change-Id: I48b8295fc75e40f5d58f99fc2809c28de48771d5
Reviewed-on: https://gerrit.libreoffice.org/63417
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 7997c12d01e03a719d9aa262cc55bc415b592ff7)
Reviewed-on: https://gerrit.libreoffice.org/63428
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/chartexport.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
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() ) { |