diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-28 21:22:56 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-02 14:08:19 +0200 |
| commit | cd8dda95c1647de8f1f0de092b1e30f2dbced22d (patch) | |
| tree | 15048b4cd44bbf60f645936db1921b70b515c595 | |
| parent | ofz#7322 lcl_MarkEqualByStart sort logic differs from that of operator== (diff) | |
| download | core-cd8dda95c1647de8f1f0de092b1e30f2dbced22d.tar.gz core-cd8dda95c1647de8f1f0de092b1e30f2dbced22d.zip | |
forcepoint#40 null deref
presumably since
commit 0098bee792c3e208ea4f6ef1c676958d3f4cd207
Date: Thu Sep 21 06:48:09 2017 +0200
tdf#112501: Pivot table: popupbuttons are placed on wrong cells
Change-Id: I5413c0ba06fca25cb22256a20ef9640767dd9e50
Reviewed-on: https://gerrit.libreoffice.org/54970
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 69c5be9b26cf1a45e220d69f65b1bb0fa2aedaf6)
| -rw-r--r-- | sc/qa/unit/data/xls/forcepoint-pivot-1.xls | bin | 0 -> 28160 bytes | |||
| -rw-r--r-- | sc/source/filter/excel/xipivot.cxx | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/qa/unit/data/xls/forcepoint-pivot-1.xls b/sc/qa/unit/data/xls/forcepoint-pivot-1.xls Binary files differnew file mode 100644 index 000000000000..12919922666b --- /dev/null +++ b/sc/qa/unit/data/xls/forcepoint-pivot-1.xls diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 11fe5a15bde4..85f178379a7c 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -1507,13 +1507,13 @@ void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveD itr = aFieldBtns.begin(); itrEnd = aFieldBtns.end(); vector<const ScDPSaveDimension*>::const_iterator itDim = aFieldDims.begin(); - for (; itr != itrEnd; ++itr, ++itDim) + for (; itr != itrEnd; ++itr) { ScMF nMFlag = ScMF::Button; - const ScDPSaveDimension* pDim = *itDim; - if (pDim->HasInvisibleMember()) + const ScDPSaveDimension* pDim = itDim != aFieldDims.end() ? *itDim++ : nullptr; + if (pDim && pDim->HasInvisibleMember()) nMFlag |= ScMF::HiddenMember; - if (!pDim->IsDataLayout()) + if (!pDim || !pDim->IsDataLayout()) nMFlag |= ScMF::ButtonPopup; rDoc.ApplyFlagsTab(itr->Col(), itr->Row(), itr->Col(), itr->Row(), itr->Tab(), nMFlag); } |