From 233286df08aeedb4e228fd523365b94543b16fca Mon Sep 17 00:00:00 2001
From: Balazs Varga <balazs.varga991@gmail.com>
Date: Tue, 13 Jul 2021 18:03:28 +0200
Subject: [PATCH] tdf#64086 tdf#143623 tdf#66250 XLSX: fix named ranges in
 charts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

tdf#64086: fix broken XLSX import of named ranges in charts

Do not create inner data table in Calc for charts, if the
data source contains named ranges. Use the named ranges
(local sheet names and global names) to find the data
source of charts, so it will be updated correctly if we
modify the values in cells.

Second part:

tdf#143623: chart OOXML, offapi: export the named ranges in charts

with the proper special (non-ooxml-standard) Excel syntax.
We need to add "[0]" characters before a global named range
for proper refreshing of chart data. Also we have to add the
sheet name to the local named ranges even if it's on the same
sheet, but only in case of charts. Because of this, add property
RefConventionChartOOXML to com::sun::star::sheet::FormulaParser,
which specifies that use special OOXML chart syntax in case of
OOXML reference convention, when parsing a formula string.

Third part:

tdf#66250 ODF chart: export the reference of named ranges

in case of charts, if the named range contains a valid reference.

Note: maybe export the name of named ranges would be a nicer
solution in the future.

Follow-up of commit 3c766512984feff739377d0f0af46558ee7139fd
"Related: tdf#64086 Add FormulaGrammar::isRefConventionOOXML()".

Thanks to Eike Rathke for his help.

Change-Id: I10d8563fb436092e833682f331c25b0c0829ef86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118862
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
---
 chart2/qa/extras/chart2export2.cxx            |  17 ++++
 .../data/xlsx/chart_with_name_range.xlsx      | Bin 0 -> 14575 bytes
 offapi/com/sun/star/sheet/FormulaParser.idl   |  10 +++
 oox/source/export/chartexport.cxx             |   2 +
 oox/source/token/properties.txt               |   1 +
 sc/inc/compiler.hxx                           |   3 +
 sc/inc/tokenuno.hxx                           |   1 +
 sc/inc/unonames.hxx                           |   1 +
 sc/qa/uitest/chart/tdf64086.py                |  31 +++++++
 sc/qa/uitest/data/tdf64086.xlsx               | Bin 0 -> 15670 bytes
 sc/source/core/tool/compiler.cxx              |  27 +++++-
 sc/source/core/tool/reftokenhelper.cxx        |  20 +++++
 sc/source/ui/unoobj/chart2uno.cxx             |  79 +++++++++++++++---
 sc/source/ui/unoobj/tokenuno.cxx              |  15 +++-
 14 files changed, 192 insertions(+), 15 deletions(-)
 create mode 100644 chart2/qa/extras/data/xlsx/chart_with_name_range.xlsx
 create mode 100644 sc/qa/uitest/chart/tdf64086.py
 create mode 100644 sc/qa/uitest/data/tdf64086.xlsx

diff --git a/chart2/qa/extras/chart2export2.cxx b/chart2/qa/extras/chart2export2.cxx
index e05d984f75cf..adde208d620c 100644
--- a/chart2/qa/extras/chart2export2.cxx
+++ b/chart2/qa/extras/chart2export2.cxx
@@ -97,6 +97,7 @@ public:
     void testTdf138181();
     void testCustomShapeText();
     void testuserShapesXLSX();
+    void testNameRangeXLSX();
 
     CPPUNIT_TEST_SUITE(Chart2ExportTest2);
     CPPUNIT_TEST(testSetSeriesToSecondaryAxisXLSX);
@@ -157,6 +158,7 @@ public:
     CPPUNIT_TEST(testTdf138181);
     CPPUNIT_TEST(testCustomShapeText);
     CPPUNIT_TEST(testuserShapesXLSX);
+    CPPUNIT_TEST(testNameRangeXLSX);
     CPPUNIT_TEST_SUITE_END();
 };
 
@@ -1420,6 +1422,21 @@ void Chart2ExportTest2::testuserShapesXLSX()
     CPPUNIT_ASSERT(!xRange->getString().isEmpty());
 }
 
+void Chart2ExportTest2::testNameRangeXLSX()
+{
+    load(u"/chart2/qa/extras/data/xlsx/", "chart_with_name_range.xlsx");
+    xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+    CPPUNIT_ASSERT(pXmlDoc);
+    // test the syntax of local range name on the the local sheet.
+    assertXPathContent(pXmlDoc,
+                       "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:cat/c:strRef/c:f",
+                       "Sheet1!local_name_range");
+    // test the syntax of a global range name.
+    assertXPathContent(pXmlDoc,
+                       "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:val/c:numRef/c:f",
+                       "[0]!series1");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/chart_with_name_range.xlsx b/chart2/qa/extras/data/xlsx/chart_with_name_range.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..2f2b814011fff6862b70c205b525e82251ede385
GIT binary patch
literal 14575
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
G-~J!%pNCxl

literal 0
HcmV?d00001

diff --git a/offapi/com/sun/star/sheet/FormulaParser.idl b/offapi/com/sun/star/sheet/FormulaParser.idl
index 2c1145ec1369..fb9085130341 100644
--- a/offapi/com/sun/star/sheet/FormulaParser.idl
+++ b/offapi/com/sun/star/sheet/FormulaParser.idl
@@ -81,6 +81,16 @@ service FormulaParser
      */
     [property] sequence< ExternalLinkInfo > ExternalLinks;
 
+
+    /** specifies that use special ooxml chart syntax in case of OOXML reference
+        convention, when parsing a formula string.
+
+        <p>Special syntax like: [0]!GlobalNamedRange, LocalSheet!LocalNamedRange</p>
+
+        @since LibreOffice 7.3
+     */
+    [property] boolean RefConventionChartOOXML;
+
 };
 
 
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 2a0d335ca86b..dfebc8bf061a 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -710,6 +710,8 @@ OUString ChartExport::parseFormula( const OUString& rRange )
         if( xParserProps.is() )
         {
             xParserProps->setPropertyValue("FormulaConvention", uno::makeAny(css::sheet::AddressConvention::XL_OOX) );
+            // For referencing named ranges correctly with special excel chart syntax.
+            xParserProps->setPropertyValue("RefConventionChartOOXML", uno::makeAny(true) );
         }
         aResult = xParser->printFormula( aTokens, CellAddress( 0, 0, 0 ) );
     }
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index b35a5bc3cd4a..808df85533ff 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -411,6 +411,7 @@ RangeYMaximum
 RangeYMinimum
 ReadOnly
 RefAngle
+RefConventionChartOOXML
 RefR
 RefX
 RefY
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 17e258dc3805..8ae65a4eb8b3 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -297,6 +297,8 @@ private:
     ExtendedErrorDetection  meExtendedErrorDetection;
     bool        mbCloseBrackets;            // whether to close open brackets automatically, default TRUE
     bool        mbRewind;                   // whether symbol is to be rewound to some step during lexical analysis
+    bool        mbRefConventionChartOOXML;  // whether to use special ooxml chart syntax in case of OOXML reference convention,
+                                            // when parsing a formula string. [0]!GlobalNamedRange, LocalSheet!LocalNamedRange
     std::vector<sal_uInt16> maExternalFiles;
 
     std::vector<OUString> maTabNames;                /// sheet names mangled for the current grammar for output
@@ -426,6 +428,7 @@ public:
      */
     void SetAutoCorrection( bool bVal );
     void            SetCloseBrackets( bool bVal ) { mbCloseBrackets = bVal; }
+    void            SetRefConventionChartOOXML( bool bVal ) { mbRefConventionChartOOXML = bVal; }
     void            SetRefConvention( const Convention *pConvP );
     void            SetRefConvention( const formula::FormulaGrammar::AddressConvention eConv );
 
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index cded5065f6b2..d025ba0cf44d 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -62,6 +62,7 @@ private:
     bool                mbEnglish;
     bool                mbIgnoreSpaces;
     bool                mbCompileFAP;
+    bool                mbRefConventionChartOOXML;
 
     void                    SetCompilerFlags( ScCompiler& rCompiler ) const;
 
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index c4e7a234f1a3..56936063f74c 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -674,6 +674,7 @@
 #define SC_UNO_OPCODEMAP            "OpCodeMap"
 #define SC_UNO_EXTERNALLINKS        "ExternalLinks"
 #define SC_UNO_COMPILEFAP           "CompileFAP"
+#define SC_UNO_REF_CONV_CHARTOOXML  "RefConventionChartOOXML"
 
 // Chart2
 #define SC_UNONAME_ROLE                 "Role"
diff --git a/sc/qa/uitest/chart/tdf64086.py b/sc/qa/uitest/chart/tdf64086.py
new file mode 100644
index 000000000000..238a936a9caa
--- /dev/null
+++ b/sc/qa/uitest/chart/tdf64086.py
@@ -0,0 +1,31 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_url_for_data_file
+
+class NamedRangesChart(UITestCase):
+
+  def test_chart_series_ranges_with_named_ranges_as_datasource(self):
+    with self.ui_test.load_file(get_url_for_data_file("tdf64086.xlsx")) as calc_doc:
+
+        xChart = calc_doc.Sheets[0].Charts[0]
+        xDataSeries = xChart.getEmbeddedObject().getFirstDiagram().CoordinateSystems[0].ChartTypes[0].DataSeries
+
+        self.assertEqual(3, len(xDataSeries))
+
+        test_range1 = calc_doc.Sheets[0].NamedRanges.getByName("Local_sheet_name")
+        self.assertEqual(xDataSeries[0].DataSequences[0].Values.SourceRangeRepresentation, test_range1.Name)
+
+        test_range2 = calc_doc.NamedRanges.getByName("global_name")
+        self.assertEqual(xDataSeries[1].DataSequences[0].Values.SourceRangeRepresentation, test_range2.Name)
+
+        test_range3 = calc_doc.Sheets[1].NamedRanges.getByName("other_sheet_name")
+        test_range3_Name = calc_doc.Sheets[1].Name + '.' + test_range3.Name
+        self.assertEqual(xDataSeries[2].DataSequences[0].Values.SourceRangeRepresentation, test_range3_Name)
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/data/tdf64086.xlsx b/sc/qa/uitest/data/tdf64086.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..4cbd5ce8dbd1d24510cca138d6d0a76882052494
GIT binary patch
literal 15670
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
Ql($#!TTItx|Kq3s2g=r8VE_OC

literal 0
HcmV?d00001

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 83eb2f4ab7db..d6ae770e5c91 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1842,6 +1842,7 @@ ScCompiler::ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos,
     meExtendedErrorDetection(EXTENDED_ERROR_DETECTION_NONE),
     mbCloseBrackets(true),
     mbRewind(false),
+    mbRefConventionChartOOXML(false),
     maTabNames(rCxt.getTabNames())
 {
     SetGrammar(rCxt.getGrammar());
@@ -1865,7 +1866,8 @@ ScCompiler::ScCompiler( ScDocument& rDocument, const ScAddress& rPos, ScTokenArr
         pConv( GetRefConvention( FormulaGrammar::CONV_OOO ) ),
         meExtendedErrorDetection( EXTENDED_ERROR_DETECTION_NONE ),
         mbCloseBrackets( true ),
-        mbRewind( false )
+        mbRewind( false ),
+        mbRefConventionChartOOXML( false )
 {
     SetGrammar( (eGrammar == formula::FormulaGrammar::GRAM_UNSPECIFIED) ?
                 rDocument.GetGrammar() :
@@ -1889,6 +1891,7 @@ ScCompiler::ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos,
     meExtendedErrorDetection(EXTENDED_ERROR_DETECTION_NONE),
     mbCloseBrackets(true),
     mbRewind(false),
+    mbRefConventionChartOOXML(false),
     maTabNames(rCxt.getTabNames())
 {
     SetGrammar(rCxt.getGrammar());
@@ -1912,7 +1915,8 @@ ScCompiler::ScCompiler( ScDocument& rDocument, const ScAddress& rPos,
         pConv( GetRefConvention( FormulaGrammar::CONV_OOO ) ),
         meExtendedErrorDetection( EXTENDED_ERROR_DETECTION_NONE ),
         mbCloseBrackets( true ),
-        mbRewind( false )
+        mbRewind( false ),
+        mbRefConventionChartOOXML( false )
 {
     SetGrammar( (eGrammar == formula::FormulaGrammar::GRAM_UNSPECIFIED) ?
                 rDocument.GetGrammar() :
@@ -2244,6 +2248,18 @@ Label_MaskStateMachine:
                     if (c == '[' && FormulaGrammar::isExcelSyntax( meGrammar)
                             && eLastOp != ocDBArea && maTableRefs.empty())
                     {
+                        // [0]!Global_Range_Name, is a special case in OOXML
+                        // syntax, where the '0' is referencing to self and we
+                        // do not need it, so we should skip it, in order to
+                        // later it will be more recognisable for IsNamedRange.
+                        if (FormulaGrammar::isRefConventionOOXML(meGrammar) &&
+                                pSrc[0] == '0' && pSrc[1] == ']' && pSrc[2] == '!')
+                        {
+                            pSrc += 3;
+                            c = *pSrc;
+                            continue;
+                        }
+
                         nMask &= ~ScCharFlags::Char;
                         goto Label_MaskStateMachine;
                     }
@@ -5313,7 +5329,7 @@ void ScCompiler::CreateStringFromIndex( OUStringBuffer& rBuffer, const FormulaTo
             if (pData)
             {
                 SCTAB nTab = _pTokenP->GetSheet();
-                if (nTab >= 0 && nTab != aPos.Tab())
+                if (nTab >= 0 && (nTab != aPos.Tab() || mbRefConventionChartOOXML))
                 {
                     // Sheet-local on other sheet.
                     OUString aName;
@@ -5326,6 +5342,11 @@ void ScCompiler::CreateStringFromIndex( OUStringBuffer& rBuffer, const FormulaTo
                         aBuffer.append(ScCompiler::GetNativeSymbol(ocErrName));
                     aBuffer.append( pConv->getSpecialSymbol( ScCompiler::Convention::SHEET_SEPARATOR));
                 }
+                else if (mbRefConventionChartOOXML)
+                {
+                    aBuffer.append("[0]");
+                    aBuffer.append(pConv->getSpecialSymbol(ScCompiler::Convention::SHEET_SEPARATOR));
+                }
                 aBuffer.append(pData->GetName());
             }
         }
diff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx
index 58d9353222dc..7d49a60f3e97 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -108,6 +108,16 @@ void ScRefTokenHelper::compileRangeRepresentation(
                 if (p->GetString().isEmpty())
                     bFailure = true;
                 break;
+            case svIndex:
+                {
+                    if (p->GetOpCode() == ocName)
+                    {
+                        ScRangeData* pNameRange = rDoc.FindRangeNameBySheetAndIndex(p->GetSheet(), p->GetIndex());
+                        if (!pNameRange->HasReferences())
+                            bFailure = true;
+                    }
+                }
+                break;
             default:
                 bFailure = true;
                 break;
@@ -150,6 +160,16 @@ bool ScRefTokenHelper::getRangeFromToken(
             rRange = rRefData.toAbs(*pDoc, rPos);
             return true;
         }
+        case svIndex:
+        {
+            if (pToken->GetOpCode() == ocName)
+            {
+                ScRangeData* pNameRange = pDoc->FindRangeNameBySheetAndIndex(pToken->GetSheet(), pToken->GetIndex());
+                if (pNameRange->IsReference(rRange, rPos))
+                    return true;
+            }
+            return false;
+        }
         default:
             ; // do nothing
     }
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 2f0461b39a5d..3d1b05256578 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -874,9 +874,21 @@ public:
 
         ScTokenRef aStart, aEnd;
         bool bValidToken = splitRangeToken(*mpDoc, rToken, aStart, aEnd);
+        // Check there is a valid reference in named range
+        if (!bValidToken && rToken->GetType() == svIndex && rToken->GetOpCode() == ocName)
+        {
+            ScRangeData* pNameRange = mpDoc->FindRangeNameBySheetAndIndex(rToken->GetSheet(), rToken->GetIndex());
+            if (pNameRange->HasReferences())
+            {
+                const ScTokenRef aTempToken = pNameRange->GetCode()->FirstToken();
+                bValidToken = splitRangeToken(*mpDoc, aTempToken, aStart, aEnd);
+            }
+        }
+
         OSL_ENSURE(bValidToken, "invalid token");
         if (!bValidToken)
             return;
+
         ScCompiler aCompiler(*mpDoc, ScAddress(0,0,0), FormulaGrammar::GRAM_ENGLISH);
         {
             OUString aStr;
@@ -1593,7 +1605,7 @@ class RangeAnalyzer
 {
 public:
     RangeAnalyzer();
-    void initRangeAnalyzer( const vector<ScTokenRef>& rTokens );
+    void initRangeAnalyzer( const ScDocument* pDoc, const vector<ScTokenRef>& rTokens );
     void analyzeRange( sal_Int32& rnDataInRows, sal_Int32& rnDataInCols,
             bool& rbRowSourceAmbiguous ) const;
     bool inSameSingleRow( const RangeAnalyzer& rOther );
@@ -1621,7 +1633,7 @@ RangeAnalyzer::RangeAnalyzer()
 {
 }
 
-void RangeAnalyzer::initRangeAnalyzer( const vector<ScTokenRef>& rTokens )
+void RangeAnalyzer::initRangeAnalyzer( const ScDocument* pDoc, const vector<ScTokenRef>& rTokens )
 {
     mnRowCount=0;
     mnColumnCount=0;
@@ -1675,6 +1687,28 @@ void RangeAnalyzer::initRangeAnalyzer( const vector<ScTokenRef>& rTokens )
                     mbAmbiguous=true;
             }
         }
+        else if (eVar == svIndex && aRefToken->GetOpCode() == ocName)
+        {
+            ScRangeData* pNameRange = pDoc->FindRangeNameBySheetAndIndex(aRefToken->GetSheet(), aRefToken->GetIndex());
+            ScRange aRange;
+            if (pNameRange->IsReference(aRange))
+            {
+                mnColumnCount = std::max<SCCOL>(mnColumnCount, static_cast<SCCOL>(abs(aRange.aEnd.Col() - aRange.aStart.Col()) + 1));
+                mnRowCount = std::max<SCROW>(mnRowCount, static_cast<SCROW>(abs(aRange.aEnd.Row() - aRange.aStart.Row()) + 1));
+                if (mnStartColumn == -1)
+                {
+                    mnStartColumn = aRange.aStart.Col();
+                    mnStartRow = aRange.aStart.Row();
+                }
+                else
+                {
+                    if (mnStartColumn != aRange.aStart.Col() && mnStartRow != aRange.aStart.Row())
+                        mbAmbiguous = true;
+                }
+            }
+            else
+                mbAmbiguous = true;
+        }
         else
             mbAmbiguous=true;
     }
@@ -1777,10 +1811,22 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
                     const sal_Unicode cSep = ScCompiler::GetNativeSymbolChar(ocSep);
                     ScRefTokenHelper::compileRangeRepresentation(
                         aTokens, xLabel->getSourceRangeRepresentation(), *m_pDocument, cSep, m_pDocument->GetGrammar(), true);
-                    aLabel.initRangeAnalyzer(aTokens);
+                    aLabel.initRangeAnalyzer(m_pDocument, aTokens);
                     for (const auto& rxToken : aTokens)
                     {
-                        ScRefTokenHelper::join(m_pDocument, aAllTokens, rxToken, ScAddress());
+                        if (rxToken->GetType() == svIndex && rxToken->GetOpCode() == ocName)
+                        {
+                            ScRangeData* pNameRange = m_pDocument->FindRangeNameBySheetAndIndex(rxToken->GetSheet(), rxToken->GetIndex());
+                            if (pNameRange->HasReferences())
+                            {
+                                const ScTokenRef aTempToken = pNameRange->GetCode()->FirstToken();
+                                ScRefTokenHelper::join(m_pDocument, aAllTokens, aTempToken, ScAddress());
+                            }
+                            else
+                                ScRefTokenHelper::join(m_pDocument, aAllTokens, rxToken, ScAddress());
+                        }
+                        else
+                            ScRefTokenHelper::join(m_pDocument, aAllTokens, rxToken, ScAddress());
                         if(!bThisIsCategories)
                             ScRefTokenHelper::join(m_pDocument, aAllSeriesLabelTokens, rxToken, ScAddress());
                     }
@@ -1795,10 +1841,22 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
                     const sal_Unicode cSep = ScCompiler::GetNativeSymbolChar(ocSep);
                     ScRefTokenHelper::compileRangeRepresentation(
                         aTokens, xValues->getSourceRangeRepresentation(), *m_pDocument, cSep, m_pDocument->GetGrammar(), true);
-                    aValues.initRangeAnalyzer(aTokens);
+                    aValues.initRangeAnalyzer(m_pDocument, aTokens);
                     for (const auto& rxToken : aTokens)
                     {
-                        ScRefTokenHelper::join(m_pDocument, aAllTokens, rxToken, ScAddress());
+                        if (rxToken->GetType() == svIndex && rxToken->GetOpCode() == ocName)
+                        {
+                            ScRangeData* pNameRange = m_pDocument->FindRangeNameBySheetAndIndex(rxToken->GetSheet(), rxToken->GetIndex());
+                            if (pNameRange->HasReferences())
+                            {
+                                const ScTokenRef aTempToken = pNameRange->GetCode()->FirstToken();
+                                ScRefTokenHelper::join(m_pDocument, aAllTokens, aTempToken, ScAddress());
+                            }
+                            else
+                                ScRefTokenHelper::join(m_pDocument, aAllTokens, rxToken, ScAddress());
+                        }
+                        else
+                            ScRefTokenHelper::join(m_pDocument, aAllTokens, rxToken, ScAddress());
                         if(bThisIsCategories)
                             ScRefTokenHelper::join(m_pDocument, aAllCategoriesValuesTokens, rxToken, ScAddress());
                     }
@@ -1885,13 +1943,13 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
         RangeAnalyzer aTop,aLeft;
         if( eRowSource==chart::ChartDataRowSource_COLUMNS )
         {
-            aTop.initRangeAnalyzer(aAllSeriesLabelTokens);
-            aLeft.initRangeAnalyzer(aAllCategoriesValuesTokens);
+            aTop.initRangeAnalyzer(m_pDocument, aAllSeriesLabelTokens);
+            aLeft.initRangeAnalyzer(m_pDocument, aAllCategoriesValuesTokens);
         }
         else
         {
-            aTop.initRangeAnalyzer(aAllCategoriesValuesTokens);
-            aLeft.initRangeAnalyzer(aAllSeriesLabelTokens);
+            aTop.initRangeAnalyzer(m_pDocument, aAllCategoriesValuesTokens);
+            aLeft.initRangeAnalyzer(m_pDocument, aAllSeriesLabelTokens);
         }
         lcl_addUpperLeftCornerIfMissing(m_pDocument, aAllTokens, aTop.getRowCount(), aLeft.getColumnCount());//e.g. #i91212#
     }
@@ -2127,6 +2185,7 @@ ScChart2DataProvider::createDataSequenceByFormulaTokens(
                 }
             }
             break;
+            case svIndex:
             case svString:
             case svSingleRef:
             case svDoubleRef:
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index b07a04e12b04..96f882d282ea 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -78,7 +78,8 @@ ScFormulaParserObj::ScFormulaParserObj(ScDocShell* pDocSh) :
     mnConv( sheet::AddressConvention::UNSPECIFIED ),
     mbEnglish( false ),
     mbIgnoreSpaces( true ),
-    mbCompileFAP( false )
+    mbCompileFAP( false ),
+    mbRefConventionChartOOXML( false )
 {
     mpDocShell->GetDocument().AddUnoObject(*this);
 }
@@ -122,7 +123,8 @@ void ScFormulaParserObj::SetCompilerFlags( ScCompiler& rCompiler ) const
     rCompiler.EnableJumpCommandReorder(!mbCompileFAP);
     rCompiler.EnableStopOnError(!mbCompileFAP);
 
-    rCompiler.SetExternalLinks( maExternalLinks);
+    rCompiler.SetExternalLinks(maExternalLinks);
+    rCompiler.SetRefConventionChartOOXML(mbRefConventionChartOOXML);
 }
 
 uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula(
@@ -243,6 +245,11 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue(
         if (!(aValue >>= maExternalLinks))
             throw lang::IllegalArgumentException();
     }
+    else if ( aPropertyName == SC_UNO_REF_CONV_CHARTOOXML )
+    {
+        if (!(aValue >>= mbRefConventionChartOOXML))
+            throw lang::IllegalArgumentException();
+    }
     else
         throw beans::UnknownPropertyException(aPropertyName);
 }
@@ -275,6 +282,10 @@ uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropert
     {
         aRet <<= maExternalLinks;
     }
+    else if ( aPropertyName == SC_UNO_REF_CONV_CHARTOOXML )
+    {
+        aRet <<= mbRefConventionChartOOXML;
+    }
     else
         throw beans::UnknownPropertyException(aPropertyName);
     return aRet;