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

[Markus Mohrhard]

 sc/source/filter/excel/xeformula.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a390df308eab5976cc1a30eaf4c405397c75eca2
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Tue Dec 30 06:16:45 2014 +0100

    use the correct tab for sheet local names, fdo#81195
    
    Change-Id: I7e8b7ed552a37c6d9c6ce7c75765267b343d508c
    Reviewed-on: https://gerrit.libreoffice.org/13696
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 214d979..145aaf3 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -2078,8 +2078,8 @@ void XclExpFmlaCompImpl::ProcessDefinedName( const XclExpScToken& rTokData )
 {
     SCTAB nTab = SCTAB_GLOBAL;
     bool bGlobal = rTokData.mpScToken->IsGlobal();
-    if (!bGlobal && mxData->mpScBasePos)
-        nTab = mxData->mpScBasePos->Tab();
+    if (!bGlobal)
+        nTab = GetCurrScTab();
 
     XclExpNameManager& rNameMgr = GetNameManager();
     sal_uInt16 nNameIdx = rNameMgr.InsertName(nTab, rTokData.mpScToken->GetIndex());