Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index



On Sun, 2012-03-04 at 17:23 +0100, Markus Mohrhard wrote:
[1] fixes a crash when you try to create a chart and have an empty
data range selected. This is a regression between 3.5.0 and 3.5.1

        I merged this to -3-5, two more acks for -3-5-1 appreciated.

The fix is extremely safe it just checks that the uno interface is not empty.

        Thanks !

                Michael.

From 6444d7ed7a4f99ffcd8d04c5d27722d8c4d942b2 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Sun, 4 Mar 2012 00:05:33 +0100
Subject: [PATCH] don't crash for empty input data in charts, fdo#46885

Signed-off-by: Michael Meeks <michael.meeks@suse.com>
---
 sc/source/ui/unoobj/chart2uno.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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 );
         }
-- 
1.7.3.4

-- 
michael.meeks@suse.com  <><, Pseudo Engineer, itinerant idiot


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.