[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sc/source

[Eike Rathke (via logerrit)]

 sc/source/core/tool/compiler.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit f987d7d7ce97bb40d571ec2f4248149e7f261ee2
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Tue Apr 6 20:58:25 2021 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Apr 7 12:31:21 2021 +0200

    Resolves: tdf#128334 Reset mnCurrentSheetEndPos, mnCurrentSheetTab in all cases
    
    Encountered for a single decimal separator not being a value
    either, but could be for any condition within IsReference()
    returning false up to the IsSingleReference() call.
    
    Change-Id: I6222adf2a2d06904001175da8798b2ba9fdef99c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113697
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 4d4fd4cc57a37a5f24178cf8bac63d979f4323da)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113647
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 85ceb6a0d8f3..7dd0ca5374a7 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3333,6 +3333,12 @@ bool ScCompiler::IsSingleReference( const OUString& rName, const OUString* pErrR
 bool ScCompiler::IsReference( const OUString& rName, const OUString* pErrRef )
 {
     // Has to be called before IsValue
+
+    // A later IsNamedRange() relies on these, being set in IsSingleReference()
+    // if so, reset in all cases.
+    mnCurrentSheetEndPos = 0;
+    mnCurrentSheetTab = -1;
+
     sal_Unicode ch1 = rName[0];
     sal_Unicode cDecSep = ( mxSymbols->isEnglish() ? '.' : ScGlobal::getLocaleDataPtr()->getNumDecimalSep()[0] );
     if ( ch1 == cDecSep )