sc/source/core/data/dpgroup.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 6f5a27a6711fa9c29c732fdac9e1f175b2a6627e
Author: Katarina Behrens <katarina.behr...@cib.de>
AuthorDate: Mon Dec 10 22:22:17 2018 +0100
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Tue Dec 11 13:11:47 2018 +0100
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.behr...@cib.de>
(cherry picked from commit 837a65cdc0bef4ef6c48f7b867c7948c70352f05)
Reviewed-on: https://gerrit.libreoffice.org/64948
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 4fecf7970d0a..0af5f2bd1d38 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -1035,7 +1035,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 DEBUG_PIVOT_TABLE
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
