From 6d9652e2864a020b61f26a7b51ca908f1d9790a8 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Sun, 27 Sep 2020 14:51:50 +0200 Subject: 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 Tested-by: Jenkins (cherry picked from commit d3a8fdf3cad0e71ff5e13bb229fed6e52206c6b9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103430 Reviewed-by: Xisco Fauli --- sc/source/core/data/documen3.cxx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'sc') 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 ); -- cgit v1.2.3