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

[Libreoffice Gerrit user]

 sc/source/ui/unoobj/PivotTableDataProvider.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa89d83cdf29ea2dc33ed99aed67df5df5424036
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 15 10:42:33 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 15 15:00:56 2018 +0200

    tdf#115086 crash in assignLabelsToDataSequence
    
    since...
    
    commit c45358e928b9b9419bba10a0fcb661696cb7647a
    Date:   Mon Apr 24 00:09:08 2017 +0200
    
        preserve "Total" label on round-trip, remove code duplication
    
    Change-Id: I83ed20e1cab8d67f2f5aedcaf862756d9548bf9f
    Reviewed-on: https://gerrit.libreoffice.org/59061
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Jenkins

diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index b0a4fe18431a..277fd285684b 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -617,7 +617,7 @@ PivotTableDataProvider::assignLabelsToDataSequence(size_t nIndex)
     {
         aLabel = ScResId(STR_PIVOT_TOTAL);
     }
-    else
+    else if (nIndex < m_aLabels.size())
     {
         for (ValueAndFormat const & rItem : m_aLabels[nIndex])
         {