diff options
| -rw-r--r-- | chart2/source/model/main/StockBar.cxx | 7 | ||||
| -rw-r--r-- | chart2/source/model/template/CandleStickChartType.cxx | 17 |
2 files changed, 8 insertions, 16 deletions
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 8f127ca0cc22..7b333412055a 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -4,9 +4,9 @@ * * $RCSfile: StockBar.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2007-07-25 08:51:31 $ + * last change: $Author: vg $ $Date: 2007-09-18 15:03:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -103,8 +103,7 @@ void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { // override other defaults - rOutMap[ ::chart::FillProperties::PROP_FILL_COLOR ] = - uno::makeAny( sal_Int32( 0xffffff) ); // white + ::chart::PropertyHelper::setPropertyValue< sal_Int32 >( rOutMap, ::chart::FillProperties::PROP_FILL_COLOR, 0xffffff ); // white } ::cppu::IPropertyArrayHelper & lcl_getInfoHelper() diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 06b23c0127fd..7622df2c0065 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -4,9 +4,9 @@ * * $RCSfile: CandleStickChartType.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2007-07-25 08:53:01 $ + * last change: $Author: vg $ $Date: 2007-09-18 15:04:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,16 +112,9 @@ void lcl_AddDefaultsToMap( { ::osl::MutexGuard aGuard( rMutex ); // must match default in CTOR! - OSL_ASSERT( rOutMap.end() == rOutMap.find( PROP_CANDLESTICKCHARTTYPE_JAPANESE )); - rOutMap[ PROP_CANDLESTICKCHARTTYPE_JAPANESE ] = - uno::makeAny( false ); - - OSL_ASSERT( rOutMap.end() == rOutMap.find( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST )); - rOutMap[ PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ] = - uno::makeAny( false ); - OSL_ASSERT( rOutMap.end() == rOutMap.find( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW )); - rOutMap[ PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ] = - uno::makeAny( true ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CANDLESTICKCHARTTYPE_JAPANESE, false ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST, false ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW, true ); } const Sequence< Property > & lcl_GetPropertySequence() |