diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-05-24 10:47:28 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-27 08:44:47 +0200 |
| commit | 652db25e342cbe710c3b5ae671dce2ec4b3ee09e (patch) | |
| tree | 0c65367a317e0ee3084ed374e9331fd577c886d9 /sc/source/ui | |
| parent | a1a39b5444842d092b1931cf42a5303bb7c1bb92 (diff) | |
Revert "tdf#37268: use also sheet local range in Pivot"
This reverts commit 73af06a6a7fcb2d92d36a45bbe54395bcba8dfb0.
The patch is wrong according to:
https://bugs.documentfoundation.org/show_bug.cgi?id=37268#c24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94748
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 818af4717bd7d4fbb6f622128c99259efb0714c9)
Change-Id: I63dd69afa3fc324930cd16ccc3458372d7745531
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94684
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
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 ) |