diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-01-09 13:00:35 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-01-16 10:03:10 +0100 |
| commit | e6223da71e7dd3744585b07a3e65ca9ed77e402c (patch) | |
| tree | a9aa15a5c95abafd062340f9bcceb7ba867c439e | |
| parent | 6515ee03560f8d21f006fa75ffd2dbd4bc15fdc2 (diff) | |
oox: add missing nullptr checks
See
http://crashreport.libreoffice.org/stats/signature/oox::drawingml::chart::PlotAreaConverter::convertFromModel(oox::drawingml::chart::View3DModel%20&)
Regression from 11473832b5717cb3222ce72baee885bc9e8e2386
Change-Id: I6cf08582fb384203ca1ce5736b88b85c11ff56da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86483
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit aa499120c4cb3935cd942751859b6d5d3689ea43)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86523
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit 085d76af93e1ac15ad2fc660f5eac91f80dfda67)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86539
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
| -rw-r--r-- | oox/source/drawingml/chart/plotareaconverter.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index 24ab5f0bfd3e..af3139618824 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -415,7 +415,8 @@ void PlotAreaConverter::convertFromModel( View3DModel& rView3DModel ) bool bSupportsVaryColorsByPoint = mrModel.maTypeGroups.size() == 1; // convert all axes sets, and check which axis is attached to the first maTypeGroups - sal_Int32 nStartAxesSetIdx = (rValAxisIds.size() > 1 && aAxesSets[0]->maAxes[1]->mnAxisId != rValAxisIds[0] ) ? 1 : 0; + sal_Int32 nStartAxesSetIdx = (rValAxisIds.size() > 1 && aAxesSets.size() > 0 && aAxesSets[0]->maAxes.count( API_Y_AXIS ) + && aAxesSets[0]->maAxes[ API_Y_AXIS ]->mnAxisId != rValAxisIds[0] ) ? 1 : 0; sal_Int32 nAxesSetIdx = nStartAxesSetIdx; for (auto const& axesSet : aAxesSets) |