diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-08-30 10:36:57 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-08-30 11:20:44 -0400 |
commit | c3148ae81b8458624b7ee829d34629dea29f8cdf (patch) | |
tree | 6460c09d77a2de0ddcb2d3b6622a7ce2538ff177 | |
parent | 8d3ea9985e6defd2b6522b755a29c6406c8cdcb6 (diff) |
fdo#53938: Check for null pointer, and don't proceed when error occurs.
This prevents the crash, the same error dialog from appearing 3 times in
a row, and also prevents the pivot table outout from becoming empty on
error condition.
Change-Id: I09a72f78561f3f0446a95732fb9c242c1144878a
Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r-- | sc/inc/dpobject.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/dpobject.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 3 |
3 files changed, 12 insertions, 5 deletions
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 86aa8aa26056..272b4592a9a8 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -245,7 +245,7 @@ public: * Remove in the save data entries for members that don't exist anymore. * This is called during pivot table refresh. */ - void SyncAllDimensionMembers(); + bool SyncAllDimensionMembers(); static bool HasRegisteredSources(); static com::sun::star::uno::Sequence<rtl::OUString> GetRegisteredSources(); diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index c21dfb662fcf..f4b39ffcf0e4 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -705,21 +705,27 @@ void ScDPObject::BuildAllDimensionMembers() pSaveData->BuildAllDimensionMembers(GetTableData()); } -void ScDPObject::SyncAllDimensionMembers() +bool ScDPObject::SyncAllDimensionMembers() { if (!pSaveData) - return; + return false; // #i111857# don't always create empty mpTableData for external service. // Ideally, xSource should be used instead of mpTableData. if (pServDesc) - return; + return false; ScDPTableData* pData = GetTableData(); + if (!pData) + // No table data exists. This can happen when refreshing from an + // external source which doesn't exist. + return false; + // Refresh the cache wrapper since the cache may have changed. pData->SetEmptyFlags(pSaveData->GetIgnoreEmptyRows(), pSaveData->GetRepeatIfEmpty()); pData->ReloadCacheTable(); pSaveData->SyncAllDimensionMembers(pData); + return true; } bool ScDPObject::GetMemberNames( sal_Int32 nDim, Sequence<OUString>& rNames ) diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 4cb562093961..e424763326d6 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1472,7 +1472,8 @@ sal_uLong ScDBDocFunc::RefreshPivotTables(ScDPObject* pDPObj, bool bApi) for (; it != itEnd; ++it) { ScDPObject* pObj = *it; - pObj->SyncAllDimensionMembers(); + if (!pObj->SyncAllDimensionMembers()) + continue; // This action is intentionally not undoable since it modifies cache. DataPilotUpdate(pObj, pObj, false, bApi); |