diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-25 07:41:26 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-25 07:41:26 +0000 |
| commit | dcbbf5cd4d294b3316e6760ad6aaae0073af3b06 (patch) | |
| tree | 787a2c452601beca33f81af0a6089c3cdeba8fc9 /chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx | |
| parent | f4f6750d7e840d82a389ab9734f5ebc6a252ec79 (diff) | |
INTEGRATION: CWS chart07 (1.9.12); FILE MERGED
2007/07/13 13:02:50 iha 1.9.12.2: #i78944# change all data labels at once
2007/07/10 11:57:29 bm 1.9.12.1: #i69281# warnings removed
Diffstat (limited to 'chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx')
| -rw-r--r-- | chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index dbe1e5520c92..55cb78e6a9dd 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -4,9 +4,9 @@ * * $RCSfile: MultipleChartConverters.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: vg $ $Date: 2007-05-22 18:01:18 $ + * last change: $Author: rt $ $Date: 2007-07-25 08:41:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -64,7 +64,7 @@ AllAxisItemConverter::AllAxisItemConverter( const uno::Reference< frame::XModel > & xChartModel, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, + const uno::Reference< lang::XMultiServiceFactory > & /*xNamedPropertyContainerFactory*/, ::std::auto_ptr< awt::Size > pRefSize ) : MultipleItemConverter( rItemPool ) { @@ -143,17 +143,17 @@ AllDataLabelItemConverter::AllDataLabelItemConverter( { uno::Reference< beans::XPropertySet > xObjectProperties( *aIt, uno::UNO_QUERY); uno::Reference< uno::XComponentContext> xContext(0);//do not need Context for label properties - if( pRefSize.get()) - m_aConverters.push_back( new ::chart::wrapper::DataPointItemConverter( + m_aConverters.push_back( new ::chart::wrapper::DataPointItemConverter( xChartModel, xContext, xObjectProperties, rItemPool, rDrawModel, NULL, xNamedPropertyContainerFactory, GraphicPropertyItemConverter::FILLED_DATA_POINT, - ::std::auto_ptr< awt::Size >( new awt::Size( *pRefSize )) )); - else - m_aConverters.push_back( new ::chart::wrapper::DataPointItemConverter( - xChartModel, xContext, xObjectProperties, rItemPool, rDrawModel, NULL, - xNamedPropertyContainerFactory )); + ::std::auto_ptr< awt::Size >( pRefSize.get() ? new awt::Size( *pRefSize ) : 0), + true, /*bDataSeries*/ + false, /*bUseSpecialFillColor*/ + 0, /*nSpecialFillColor*/ + true /*bOverwriteLabelsForAttributedDataPointsAlso*/ + )); } } |