[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/source

Markus Mohrhard markus.mohrhard at collabora.co.uk
Mon Dec 29 21:36:24 PST 2014


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

New commits:
commit 81fd0162d69f2753e669093b9bb0cd6e7693743b
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

diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 654cc14..9017103 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -2095,8 +2095,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());


More information about the Libreoffice-commits mailing list