[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

[Eike Rathke]

 sc/source/core/tool/rangenam.cxx        |    8 +++++++-
 sc/source/filter/excel/xiname.cxx       |    3 +++
 sc/source/filter/oox/defnamesbuffer.cxx |    2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 9e019a647dc76706c438a8842c40ce7a8829216f
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Jan 29 18:19:33 2018 +0100

    CheckLinkFormulaNeedingCheck() for named expressions
    
     This is a combination of 3 commits.
    
    CheckLinkFormulaNeedingCheck() for .ods named expressions
    
    This is specifically necessary for named expressions that are used
    in conditional format formulas, for which RPN is generated at a
    later stage, not during import.
    
    (cherry picked from commit eae9648e99be53ba441d9d8207aac6f3ce211ef2)
    
    CheckLinkFormulaNeedingCheck() for .xls named expressions
    
    (cherry picked from commit 8512f13c42ae3fbb287a555616fe10ff04295616)
    
    CheckLinkFormulaNeedingCheck() for .xlsx named expressions
    
    (cherry picked from commit a1f933ee2b9e23a505d937035821e9571cf4119c)
    
    e03cb5767c34f8157a492a6d6c3b0700d065052d
    217c89822ab477a6c383d170ae739e44efd10fa3
    
    Change-Id: I54ab8dc14f81d6b18b0d17f448187d19d8e396fc
    Reviewed-on: https://gerrit.libreoffice.org/48857
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index de12cc15cf6c..bf946130337b 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -63,9 +63,14 @@ ScRangeData::ScRangeData( ScDocument* pDok,
                 mnMaxCol    (-1)
 {
     if (!rSymbol.isEmpty())
-        CompileRangeData( rSymbol, pDoc->IsImportingXML());
+    {
         // Let the compiler set an error on unknown names for a subsequent
         // CompileUnresolvedXML().
+        const bool bImporting = pDoc->IsImportingXML();
+        CompileRangeData( rSymbol, bImporting);
+        if (bImporting)
+            pDoc->CheckLinkFormulaNeedingCheck( *pCode);
+    }
     else
     {
         // #i63513#/#i65690# don't leave pCode as NULL.
@@ -194,6 +199,7 @@ void ScRangeData::CompileUnresolvedXML( sc::CompileFormulaContext& rCxt )
         // Don't let the compiler set an error for unknown names on final
         // compile, errors are handled by the interpreter thereafter.
         CompileRangeData( aSymbol, false);
+        rCxt.getDoc()->CheckLinkFormulaNeedingCheck( *pCode);
     }
 }
 
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index eb4c537398fe..12e6ba3e91f8 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -270,7 +270,10 @@ void XclImpName::InsertName(const ScTokenArray* pArray)
         }
     }
     if (pData)
+    {
+        GetDoc().CheckLinkFormulaNeedingCheck( *pData->GetCode());
         mpScData = pData;               // cache for later use
+    }
 }
 
 XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) :
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index d7fb59ff934a..6f761b2c9b7c 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -39,6 +39,7 @@
 #include <tokenarray.hxx>
 #include <tokenuno.hxx>
 #include <compiler.hxx>
+#include <document.hxx>
 
 namespace oox {
 namespace xls {
@@ -332,6 +333,7 @@ std::unique_ptr<ScTokenArray> DefinedName::getScTokens(
     // after, a resulting error must be reset.
     FormulaError nErr = pArray->GetCodeError();
     aCompiler.CompileTokenArray();
+    getScDocument().CheckLinkFormulaNeedingCheck( *pArray);
     pArray->DelRPN();
     pArray->SetCodeError(nErr);