summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorKatarina Behrens <Katarina.Behrens@cib.de>2018-12-10 22:22:17 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-12-11 15:24:40 +0100
commit1c34812c11248649321b7106dfdc22f1d75091a9 (patch)
treecb2763902c3ab98f1ebe8b26e018c31a3cb73169 /sc
parent90bff963ef6fb1dc0beac291a0d90c3b0bdfcf66 (diff)
crashtesting: ooo55266-3.ods some members are nullptr
Crashes since commit 6481bda69ade61cb5420156272fcf17edd43d620 tdf#121612: update pivot caches during saving to XLSX without refresh, pivot cache export was skipped entirely Change-Id: Ic68d4974d5cb9278d61938a59aa8f1a01b920f1f Reviewed-on: https://gerrit.libreoffice.org/64903 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 837a65cdc0bef4ef6c48f7b867c7948c70352f05) Reviewed-on: https://gerrit.libreoffice.org/64946 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/dpgroup.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index dd81548777a3..8a9ec6714561 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -1030,7 +1030,11 @@ long ScDPGroupTableData::Compare(long nDim, long nDataId1, long nDataId2)
{
if ( getIsDataLayoutDimension(nDim) )
return 0;
- return ScDPItemData::Compare( *GetMemberById(nDim, nDataId1),*GetMemberById(nDim, nDataId2) );
+ const ScDPItemData* rItem1 = GetMemberById(nDim, nDataId1);
+ const ScDPItemData* rItem2 = GetMemberById(nDim, nDataId2);
+ if (rItem1 == nullptr || rItem2 == nullptr)
+ return 0;
+ return ScDPItemData::Compare( *rItem1,*rItem2);
}
#if DUMP_PIVOT_TABLE