diff options
| author | Eike Rathke <erack@redhat.com> | 2018-11-15 13:27:10 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-11-15 16:05:39 +0100 |
| commit | 7997c12d01e03a719d9aa262cc55bc415b592ff7 (patch) | |
| tree | 7b72094b0688c986a3f7a365adba2a361f485071 /oox | |
| parent | Revert "revert 25622f29b4003307d2ba780ff1232d8b7cdafa35 in list.cxx" (diff) | |
| download | core-7997c12d01e03a719d9aa262cc55bc415b592ff7.tar.gz core-7997c12d01e03a719d9aa262cc55bc415b592ff7.zip | |
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
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 80630b4c4d90..08b296f57cb6 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -410,10 +410,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() ) { |