From 3db92283955741b490dc2d4f9e1782b179fee894 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Thu, 10 Jan 2013 23:48:17 -0500 Subject: fdo#59084: Sync dimension members after reloading the group data. Else the syncing would end up syncing to the older version of the group data before the reload, which (as you can see in the bug report) may lead to a crash. Change-Id: Ibd674a97a59205e5e28efd007f8857731e8df4d3 --- sc/source/ui/docshell/dbdocfun.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 4d0d2ec61b64..94d4f1f7a024 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1319,6 +1319,8 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb if ( pDestObj ) { pDestObj->ReloadGroupTableData(); + if (!pDestObj->SyncAllDimensionMembers()) + return false; pDestObj->InvalidateData(); // before getting the new output area // make sure the table has a name (not set by dialog) @@ -1461,11 +1463,10 @@ sal_uLong ScDBDocFunc::RefreshPivotTables(ScDPObject* pDPObj, bool bApi) for (; it != itEnd; ++it) { ScDPObject* pObj = *it; - if (!pObj->SyncAllDimensionMembers()) - continue; // This action is intentionally not undoable since it modifies cache. - DataPilotUpdate(pObj, pObj, false, bApi); + if (!DataPilotUpdate(pObj, pObj, false, bApi)) + continue; } return 0; -- cgit