diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-18 14:04:24 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-18 14:04:24 +0000 |
commit | 844fc6dbcc379fe3c63cf620ce9ed3be76fae958 (patch) | |
tree | 82ea37790407a846a4c69100288761b991aefb10 | |
parent | e90678d0a906f1e0bd5f718f31c1906acdf22eff (diff) |
INTEGRATION: CWS chart11 (1.9.2); FILE MERGED
2007/08/23 12:37:05 bm 1.9.2.2: RESYNC: (1.9-1.10); FILE MERGED
2007/07/31 12:56:45 bm 1.9.2.1: #i80084# avoid usage of map operator[] with enums as keys, simplify initialization of default property values
-rw-r--r-- | chart2/source/model/template/BarChartTypeTemplate.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 2c85c68c1314..670682aea63b 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -4,9 +4,9 @@ * * $RCSfile: BarChartTypeTemplate.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2007-08-03 12:35:37 $ + * last change: $Author: vg $ $Date: 2007-09-18 15:04:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -97,12 +97,8 @@ void lcl_AddPropertiesToVector( void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { - OSL_ASSERT( rOutMap.end() == rOutMap.find( PROP_BAR_TEMPLATE_DIMENSION )); - rOutMap[ PROP_BAR_TEMPLATE_DIMENSION ] = - uno::makeAny( sal_Int32( 2 ) ); - OSL_ASSERT( rOutMap.end() == rOutMap.find( PROP_BAR_TEMPLATE_GEOMETRY3D )); - rOutMap[ PROP_BAR_TEMPLATE_GEOMETRY3D ] = - uno::makeAny( chart2::DataPointGeometry3D::CUBOID ); + ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_BAR_TEMPLATE_DIMENSION, 2 ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BAR_TEMPLATE_GEOMETRY3D, ::chart2::DataPointGeometry3D::CUBOID ); } const Sequence< Property > & lcl_GetPropertySequence() |