diff options
| author | Eike Rathke <erack@redhat.com> | 2016-03-17 23:18:06 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-03-18 10:37:40 +0100 |
| commit | 64e542413851236c75e25185c137d6fd6ddfe3a1 (patch) | |
| tree | 63917c801d463b4544aad77a70e688612169d136 /sc/source/filter/excel/xeformula.cxx | |
| parent | f4c59e5364e449bd8ce5420ff57331677ff859b9 (diff) | |
Resolves: tdf#96915 implement other-sheet-local named expressions
Change-Id: I0d62536caa6eb455473a755067abc585662cd9a5
Diffstat (limited to 'sc/source/filter/excel/xeformula.cxx')
| -rw-r--r-- | sc/source/filter/excel/xeformula.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 29ac7a0be289..9742cb6ad7ed 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -2079,10 +2079,8 @@ void XclExpFmlaCompImpl::ProcessExternalRangeRef( const XclExpScToken& rTokData void XclExpFmlaCompImpl::ProcessDefinedName( const XclExpScToken& rTokData ) { - SCTAB nTab = SCTAB_GLOBAL; - bool bGlobal = rTokData.mpScToken->IsGlobal(); - if (!bGlobal) - nTab = GetCurrScTab(); + sal_Int16 nSheet = rTokData.mpScToken->GetSheet(); + SCTAB nTab = (nSheet < 0 ? SCTAB_GLOBAL : nSheet); XclExpNameManager& rNameMgr = GetNameManager(); sal_uInt16 nNameIdx = rNameMgr.InsertName(nTab, rTokData.mpScToken->GetIndex()); |