[Libreoffice-commits] core.git: oox/source

[Libreoffice Gerrit user]

 oox/source/export/chartexport.cxx |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 7997c12d01e03a719d9aa262cc55bc415b592ff7
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Thu Nov 15 13:27:10 2018 +0100
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Thu Nov 15 16:05:39 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 <erack at redhat.com>
    Tested-by: Jenkins

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() )
         {