[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - filter/source

Caolán McNamara caolanm at redhat.com
Tue Mar 21 15:25:16 UTC 2017


 filter/source/msfilter/svdfppt.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 2f0e14de089b9da350444bddb5baf6ba9baac338
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 16 09:13:13 2017 +0000

    ofz#876 avoid accessing empty rows
    
    (cherry picked from commit b9892037c303e645ee1a987d80734361700d91ac)
    
    Change-Id: Iba539fb03611bbe5627cc7976c1146d08a2ab5fd
    Reviewed-on: https://gerrit.libreoffice.org/35257
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 2c05ce0d7403..a64ff32d6db0 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7631,6 +7631,10 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab
                     aColumns.insert( aSnapRect.Left() );
                 }
             }
+
+            if (aRows.empty())
+                return pRet;
+
             sdr::table::SdrTableObj* pTable = new sdr::table::SdrTableObj( pSdrModel );
             pTable->uno_lock();
             Reference< XTable > xTable( pTable->getTable() );


More information about the Libreoffice-commits mailing list