diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 10:36:10 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 10:36:10 +0000 |
| commit | 69564a53c9d191dcdf037a1d29657537870d7b96 (patch) | |
| tree | c4e6d38d16c899a846495f818881bdcc0ec8d144 /xmloff/source/chart | |
| parent | 15a9d42bcb0fdfba1d58388af54e89ddc15bc459 (diff) | |
INTEGRATION: CWS chart27 (1.98.42); FILE MERGED
2008/06/10 08:24:28 iha 1.98.42.2: RESYNC: (1.98-1.99); FILE MERGED
2008/06/05 09:08:20 iha 1.98.42.1: #i88591# Charts with empty cells change aftercopy/paste from Calc to Writer
Diffstat (limited to 'xmloff/source/chart')
| -rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 57e3771f64bf..e17be58c5bc5 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SchXMLExport.cxx,v $ - * $Revision: 1.99 $ + * $Revision: 1.100 $ * * This file is part of OpenOffice.org. * @@ -544,7 +544,7 @@ double lcl_getValueFromSequence( const Reference< chart2::data::XDataSequence > else if( xSeq.is()) { Sequence< uno::Any > aAnies( xSeq->getData()); - aResult.resize( aAnies.getLength()); + aResult.resize( aAnies.getLength(), fNan ); for( sal_Int32 i=0; i<aAnies.getLength(); ++i ) aAnies[i] >>= aResult[i]; } @@ -568,11 +568,12 @@ struct lcl_TableData template< class T > struct lcl_resize { - lcl_resize( typename T::size_type nSize ) : m_nSize( nSize ) {} + lcl_resize( typename T::size_type nSize, typename T::value_type fDefaultValue ) : m_nSize( nSize ), m_fDefaultValue( fDefaultValue ) {} void operator()( T & t ) - { t.resize( m_nSize ); } + { t.resize( m_nSize, m_fDefaultValue ); } private: typename T::size_type m_nSize; + typename T::value_type m_fDefaultValue; }; @@ -666,7 +667,7 @@ lcl_TableData lcl_getDataForLocalTable( double fNan = 0.0; ::rtl::math::setNan( &fNan ); ::std::for_each( aResult.aDataInRows.begin(), aResult.aDataInRows.end(), - lcl_resize< lcl_TableData::tTwoDimNumberContainer::value_type >( nNumColumns )); + lcl_resize< lcl_TableData::tTwoDimNumberContainer::value_type >( nNumColumns, fNan )); aResult.aFirstRowStrings.resize( nNumColumns ); aResult.aFirstColumnStrings.resize( nNumRows ); |