From 1975fe4be8347d244643a0fbab20357485d41522 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 Reviewed-on: https://gerrit.libreoffice.org/1635 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard Reviewed-on: https://gerrit.libreoffice.org/1651 Reviewed-by: Noel Power Tested-by: Noel Power --- sc/source/ui/docshell/dbdocfun.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index e424763326d6..5216c6811786 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1330,6 +1330,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) @@ -1472,8 +1474,6 @@ 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); -- cgit v1.2.3