summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2020-09-27 14:51:50 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2020-09-28 14:17:39 +0200
commit6d9652e2864a020b61f26a7b51ca908f1d9790a8 (patch)
tree326a0a0d37646337325a17704f19f9b580692e1b /sc
parenta9a826b82a69f92ebeed66552dbc2630b20bacaf (diff)
Resolves: tdf#67007 display sheet-local range name in Name Box for selection
Change-Id: Ia9980b13ed5c93cc72231ead532e3916e6234f56 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103509 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit d3a8fdf3cad0e71ff5e13bb229fed6e52206c6b9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103430 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/documen3.cxx14
1 files changed, 14 insertions, 0 deletions
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 33c9a2b5665b..f34389e9fe35 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -239,6 +239,20 @@ bool ScDocument::InsertNewRangeName( SCTAB nTab, const OUString& rName, const Sc
const ScRangeData* ScDocument::GetRangeAtBlock( const ScRange& rBlock, OUString* pName ) const
{
const ScRangeData* pData = nullptr;
+ if (rBlock.aStart.Tab() == rBlock.aEnd.Tab())
+ {
+ const ScRangeName* pLocalNames = GetRangeName(rBlock.aStart.Tab());
+ if (pLocalNames)
+ {
+ pData = pLocalNames->findByRange( rBlock );
+ if (pData)
+ {
+ if (pName)
+ *pName = pData->GetName();
+ return pData;
+ }
+ }
+ }
if ( pRangeName )
{
pData = pRangeName->findByRange( rBlock );