chart2/source/view/charttypes/GL3DBarChart.cxx | 11 +++++++++-- sc/source/ui/dbgui/tpsort.cxx | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-)
New commits: commit 05e7b1db351ee964d155e49c55de7db3c917083f Author: Caolán McNamara <caol...@redhat.com> Date: Fri Jan 23 15:02:31 2015 +0000 Resolves: fdo#88229 Crash when you try to create a bar chart GL3D Change-Id: I6390f8988ca287de19e9981053bdeb9473d1e3e1 diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 407c34f..0701b8c 100755 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -649,8 +649,15 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer sal_Int32 nSeriesIndex = 0; sal_Int32 nMaxPointCount = 0; double nMaxVal = findMaxValue(rDataSeriesContainer)/100; - const VDataSeries& rFirstRow = *(rDataSeriesContainer.begin()); - mnBarsInRow = rFirstRow.getTotalPointCount(); + if (rDataSeriesContainer.empty()) + { + mnBarsInRow = 0; + } + else + { + const VDataSeries& rFirstRow = *(rDataSeriesContainer.begin()); + mnBarsInRow = rFirstRow.getTotalPointCount(); + } for (boost::ptr_vector<VDataSeries>::const_iterator itr = rDataSeriesContainer.begin(), itrEnd = rDataSeriesContainer.end(); itr != itrEnd; ++itr) { commit 0442cd217645aa4fdd924e4c2e4f90a77f1fbbad Author: Caolán McNamara <caol...@redhat.com> Date: Fri Jan 23 14:42:28 2015 +0000 Resolves: fdo#88735 crash after calling sort after subtotal removal Change-Id: Ia30271426ea47b7bf5af85d16591a02e6d52b3d9 diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 55557b2..ba3703f 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -150,7 +150,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ ) FillFieldLists(0); // ListBox selection: - if ( aSortData.maKeyState[0].bDoSort ) + if (!aSortData.maKeyState.empty() && aSortData.maKeyState[0].bDoSort) { // Make sure that the all sort keys are reset for ( sal_uInt16 i=nSortKeyCount; i<aSortData.GetSortKeyCount(); i++ )
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits