diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-06-11 14:04:31 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-06-11 14:04:31 +0000 |
| commit | 7406f9a39f8bd09ca5e79e69d7da1c7a9e83d614 (patch) | |
| tree | d9064fe2ad0bf8cd02f623c1dc675957bb0bf72e /chart2 | |
| parent | 41bb26b8dfe105c5d514ddd2a00b0b8a1d28a375 (diff) | |
INTEGRATION: CWS chart05 (1.24.2); FILE MERGED
2007/05/25 16:27:57 iha 1.24.2.1: #i71328# Automatic Symbols for lines in combi charts are not the same as in older versions
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/view/main/VDataSeries.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 0c2fdc42de11..7961c5068d17 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -4,9 +4,9 @@ * * $RCSfile: VDataSeries.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: vg $ $Date: 2007-05-22 19:26:09 $ + * last change: $Author: obo $ $Date: 2007-06-11 15:04:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -183,6 +183,8 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) , m_aPointCID_Stub() , m_aLabelCID_Stub() + , m_nGlobalSeriesIndex(0) + , m_apLabel_Series(NULL) , m_apLabelPropNames_Series(NULL) , m_apLabelPropValues_Series(NULL) @@ -329,6 +331,11 @@ void VDataSeries::setCategoryXAxis() m_aValues_X.clear(); } +void VDataSeries::setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex ) +{ + m_nGlobalSeriesIndex = nGlobalSeriesIndex; +} + void VDataSeries::setParticle( const rtl::OUString& rSeriesParticle ) { m_aSeriesParticle = rSeriesParticle; @@ -594,7 +601,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const { pRet->Style = SymbolStyle_STANDARD; - sal_Int32 nIndex = ObjectIdentifier::getIndexFromParticleOrCID( getSeriesParticle() ); + sal_Int32 nIndex = m_nGlobalSeriesIndex; if(m_aValues_X.is()) nIndex++; pRet->StandardSymbol = nIndex; |