Skip to content

C
core
Kaydet (Commit) 1bba2b51 authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Kohei Yoshida
Dosyalara gözat
Seçenekler

give local range names higher priority than global ones 

Signed-off-by: 's avatarKohei Yoshida <kyoshida@novell.com>
üst 4044ce2b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
sc/source/core/tool/compiler.cxx
Dosyayı görüntüle @ 1bba2b51
...@@ -2892,18 +2892,17 @@ sal_Bool ScCompiler::IsNamedRange( const String& rUpperName ) ...@@ -2892,18 +2892,17 @@ sal_Bool ScCompiler::IsNamedRange( const String& rUpperName )
{ {
// IsNamedRange is called only from NextNewToken, with an upper-case string // IsNamedRange is called only from NextNewToken, with an upper-case string
// Try global named ranges first, then sheet local next. BTW does this // try local names first
// order matter? bool bGlobal = false;
bool bGlobal = true; ScRangeName* pRangeName = pDoc->GetRangeName(aPos.Tab());
ScRangeName* pRangeName = pDoc->GetRangeName();
const ScRangeData* pData = pRangeName->findByUpperName(rUpperName); const ScRangeData* pData = pRangeName->findByUpperName(rUpperName);
if (!pData) if (!pData)
{ {
pRangeName = pDoc->GetRangeName(aPos.Tab()); pRangeName = pDoc->GetRangeName();
if (pRangeName) if (pRangeName)
pData = pRangeName->findByUpperName(rUpperName); pData = pRangeName->findByUpperName(rUpperName);
if (pData) if (pData)
bGlobal = false; bGlobal = true;
} }
if (pData) if (pData)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment