diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-01-06 11:11:47 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-01-06 11:11:47 +0100 |
commit | fa663ff3fef9992ea327a571cdc123d23cf4b9da (patch) | |
tree | 94cb9e00b25076142efc24ecaa4842cc04b1c273 /chart2/source/tools/InternalDataProvider.cxx | |
parent | e3c9000303f73558849a3e9b493b53ac67678f1f (diff) | |
parent | e0cef95bab1bd41fce1f08be9d6a2fed71f16944 (diff) |
rebase to DEV300_m96
Diffstat (limited to 'chart2/source/tools/InternalDataProvider.cxx')
-rwxr-xr-x[-rw-r--r--] | chart2/source/tools/InternalDataProvider.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 4abc51be31af..26b2db4fc253 100644..100755 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -356,9 +356,11 @@ InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocum if( xSeq.is() ) aStringSeq = xSeq->getTextualData(); // @todo: be able to deal with XDataSequence, too sal_Int32 nLength = aStringSeq.getLength(); - if( static_cast< sal_Int32 >(aNewCategories.size()) < nLength ) + sal_Int32 nCatLength = static_cast< sal_Int32 >(aNewCategories.size()); + if( nCatLength < nLength ) aNewCategories.resize( nLength ); - + else if( nLength < nCatLength ) + aStringSeq.realloc( nCatLength ); transform( aNewCategories.begin(), aNewCategories.end(), aStringSeq.getConstArray(), aNewCategories.begin(), lcl_setStringAtLevel(nL) ); } |