[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - chart2/source

[Libreoffice Gerrit user]

 chart2/source/view/axes/Tickmarks_Equidistant.hxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit b86f5f438f1a6973830d2a588f6c5356b3c70bcf
Author:     Markus Mohrhard <markus.mohrhard at googlemail.com>
AuthorDate: Tue Sep 25 01:05:14 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 4 11:03:01 2018 +0200

    tdf#120015, don't crash without major tick marks
    
    Change-Id: Icac79eb1c0c47388f96d37d2921c81fb6c848607
    Reviewed-on: https://gerrit.libreoffice.org/60948
    Tested-by: Jenkins
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 217cb86dd06f0c539d6181d9b7fd0d71c4edd628)
    Reviewed-on: https://gerrit.libreoffice.org/60962
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx
index 72897c048311..4c89d4b44251 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx
@@ -57,7 +57,11 @@ private: //methods
                     if(m_pSimpleTicks)
                         return (*m_pSimpleTicks)[nDepth][nIndex];
                     else
+                    {
+                        if ((*m_pInfoTicks)[nDepth].size() <= size_t(nIndex))
+                            return std::numeric_limits<double>::max();
                         return (((*m_pInfoTicks)[nDepth])[nIndex]).fScaledTickValue;
+                    }
                 }
     sal_Int32   getTickCount( sal_Int32 nDepth ) const
                 {