*** oirg/chart2/source/tools/InternalDataProvider.cxx Thu Jun 11 01:11:36 2009 --- new/chart2/source/tools/InternalDataProvider.cxx Mon Aug 24 11:43:00 2009 *************** *** 739,744 **** --- 739,752 ---- { ::std::vector< OUString > aLabels( rInternalData.getColumnLabels()); OSL_ASSERT( static_cast< size_t >( nNewIndex ) < aLabels.size()); + if( static_cast< size_t >( nNewIndex ) >= aLabels.size() ) + { + aResult[i] = + Reference< chart2::data::XLabeledDataSequence >( + new LabeledDataSequence( xNewValues )); + break; + } + aLabels[nNewIndex] = impl::FlattenStringSequence( xLabel->getTextualData()); rInternalData.setColumnLabels( aLabels ); Reference< chart2::data::XDataSequence > xNewLabel( *** oirg/sc/source/ui/unoobj/chartuno.cxx Tue Dec 9 01:50:45 2008 --- new/sc/source/ui/unoobj/chartuno.cxx Mon Aug 24 09:31:24 2009 *************** *** 256,268 **** if( xReceiver.is()) { // connect ! xReceiver->attachDataProvider( xDataProvider ); ! uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( pDocShell->GetModel(), uno::UNO_QUERY ); ! xReceiver->attachNumberFormatsSupplier( xNumberFormatsSupplier ); ! // set arguments String sRangeStr; xNewRanges->Format(sRangeStr, SCR_ABS_3D, pDoc); uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( ::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1, --- 256,273 ---- if( xReceiver.is()) { // connect ! if( aRanges.getLength() ) ! { ! xReceiver->attachDataProvider( xDataProvider ); ! uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( pDocShell->GetModel(), uno::UNO_QUERY ); ! xReceiver->attachNumberFormatsSupplier( xNumberFormatsSupplier ); ! } ! // set arguments String sRangeStr; xNewRanges->Format(sRangeStr, SCR_ABS_3D, pDoc); + if( !sRangeStr.Len() && !aRanges.getLength() ) + sRangeStr = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "all" ) ); uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( ::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1,