[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - sc/source

Eike Rathke erack at kemper.freedesktop.org
Mon Mar 5 04:37:59 PST 2012


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

New commits:
commit 09c97519a1ccb8935787946b63cfb0b142f540e3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Mar 4 00:05:33 2012 +0100

    don't crash for empty input data in charts, fdo#46885
    
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>
    (cherry picked from commit 6444d7ed7a4f99ffcd8d04c5d27722d8c4d942b2)
    
    Signed-off-by: Eike Rathke <erack at redhat.com>
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 53b049b..93dcb56 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1565,7 +1565,7 @@ ScChart2DataProvider::createDataSource(
         }
         Reference< chart2::data::XLabeledDataSequence > xChartSeries = lcl_createLabeledDataSequenceFromTokens(
             pValueTokens, pLabelTokens, m_pDocument, this, m_bIncludeHiddenCells ); //ownership of pointers is transfered!
-        if ( xChartSeries.is() && xChartSeries->getValues()->getData().getLength() )
+        if ( xChartSeries.is() && xChartSeries->getValues().is() && xChartSeries->getValues()->getData().getLength() )
         {
             aSeqs.push_back( xChartSeries );
         }


More information about the Libreoffice-commits mailing list