diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-06-15 20:56:17 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-06-15 15:20:05 -0400 |
| commit | 1bba2b51f3a63af717b4c2d2922f38796c687e3a (patch) | |
| tree | 6dc4bc0a7f8c09e442a903cc36d29557ae7e7d46 /sc/source | |
| parent | 4044ce2b6d94bdedca03137018fe8b00ea1f9264 (diff) | |
give local range names higher priority than global ones
Signed-off-by: Kohei Yoshida <kyoshida@novell.com>
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/tool/compiler.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index ad3052585784..e4eab3fa510f 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -2892,18 +2892,17 @@ sal_Bool ScCompiler::IsNamedRange( const String& rUpperName ) { // IsNamedRange is called only from NextNewToken, with an upper-case string - // Try global named ranges first, then sheet local next. BTW does this - // order matter? - bool bGlobal = true; - ScRangeName* pRangeName = pDoc->GetRangeName(); + // try local names first + bool bGlobal = false; + ScRangeName* pRangeName = pDoc->GetRangeName(aPos.Tab()); const ScRangeData* pData = pRangeName->findByUpperName(rUpperName); if (!pData) { - pRangeName = pDoc->GetRangeName(aPos.Tab()); + pRangeName = pDoc->GetRangeName(); if (pRangeName) pData = pRangeName->findByUpperName(rUpperName); if (pData) - bGlobal = false; + bGlobal = true; } if (pData) |