diff options
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/view/cellsh1.cxx | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 44ef3d49c330..5873272f1dfe 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <globalnames.hxx> #include <config_features.h> #include <com/sun/star/i18n/TextConversionOption.hpp> @@ -2808,31 +2807,12 @@ void ScCellShell::ExecuteDataPilotDialog() pTabViewShell->GetFrameWeld(), bEnableExt)); // Populate named ranges (if any). - // We must take into account 2 types of scope : global doc and sheets - // for global doc: <name of the range> - // for sheets: <sheetname>.<name of the range> - std::map<OUString, ScRangeName*> aRangeMap; - pDoc->GetRangeNameMap(aRangeMap); - for (auto const& elemRangeMap : aRangeMap) + ScRangeName* pRangeName = pDoc->GetRangeName(); + if (pRangeName) { - ScRangeName* pRangeName = elemRangeMap.second; - if (pRangeName) - { - if (elemRangeMap.first == STR_GLOBAL_RANGE_NAME) - { - for (auto const& elem : *pRangeName) - pTypeDlg->AppendNamedRange(elem.second->GetName()); - } - else - { - OUString aScope(elemRangeMap.first); - ScGlobal::AddQuotes(aScope, '\''); - for (auto const& elem : *pRangeName) - { - pTypeDlg->AppendNamedRange(aScope + "." + elem.second->GetName()); - } - } - } + ScRangeName::const_iterator itr = pRangeName->begin(), itrEnd = pRangeName->end(); + for (; itr != itrEnd; ++itr) + pTypeDlg->AppendNamedRange(itr->second->GetName()); } if ( pTypeDlg->Execute() == RET_OK ) |