summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Bouron <bouron.d@gmail.com>2017-08-03 11:57:48 +0200
committerEike Rathke <erack@redhat.com>2017-09-06 10:27:37 +0200
commit3d37e10684edf9536beefe5670b144571e6c9792 (patch)
tree4528ae6ebf13c29f3a3751a8bd1fa39335215047
parent1683f9848c3bd89fff430330a500756c4b130457 (diff)
tdf#111305: Fix group name refresh in pivot table
Change-Id: Ibc22bfba5765aba3014651df50afb23b893d2b5a Reviewed-on: https://gerrit.libreoffice.org/40712 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
-rw-r--r--sc/source/ui/view/dbfunc3.cxx14
1 files changed, 14 insertions, 0 deletions
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index c6d04090c997..186007cae57a 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -73,6 +73,8 @@
#include <unordered_set>
#include <unordered_map>
#include <vector>
+#include <set>
+#include <algorithm>
using namespace com::sun::star;
using ::com::sun::star::uno::Any;
@@ -1333,6 +1335,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString )
pDPObj->BuildAllDimensionMembers();
ScDPSaveData aData( *pDPObj->GetSaveData() );
bool bChange = false;
+ bool bNeedReloadGroups = false;
DataPilotFieldOrientation nOrient = DataPilotFieldOrientation_HIDDEN;
long nField = pDPObj->GetHeaderDim( rPos, nOrient );
@@ -1453,6 +1456,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString )
pSaveMember->SetName( rString );
bChange = true;
+ bNeedReloadGroups = true;
}
else
pErrorId = STR_INVALIDNAME;
@@ -1571,6 +1575,16 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString )
// apply changes
ScDBDocFunc aFunc( *GetViewData().GetDocShell() );
pDPObj->SetSaveData( aData );
+ if (bNeedReloadGroups)
+ {
+ ScDPCollection* pDPs = pDoc->GetDPCollection();
+ if (pDPs)
+ {
+ std::set<ScDPObject*> aRefs;
+ // tdf#111305: Reload groups in cache after modifications.
+ pDPs->ReloadGroupsInCache(pDPObj, aRefs);
+ } // pDPs
+ } // bNeedReloadGroups
aFunc.UpdatePivotTable(*pDPObj, true, false);
}
else