diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 15:53:45 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 15:53:45 +0000 |
commit | dd0cb274ce33ac3e3e81bcc7be4e94734c08f9b4 (patch) | |
tree | 279d3afc7b695a9b3ddc893ebbd413b0eb907129 /chart2/source/model/main/DataPointProperties.cxx | |
parent | a833b4d575dd948ee829fa792ebfde3319116d7c (diff) |
INTEGRATION: CWS chart14 (1.13.26); FILE MERGED
2007/09/28 10:22:54 iha 1.13.26.3: #i82051# Allow to display each part of a data label in a separate line
2007/09/24 11:53:19 bm 1.13.26.2: RESYNC: (1.13-1.14); FILE MERGED
2007/08/10 22:29:06 iha 1.13.26.1: #i37792# number format for data labels
Diffstat (limited to 'chart2/source/model/main/DataPointProperties.cxx')
-rw-r--r-- | chart2/source/model/main/DataPointProperties.cxx | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 0b12d548010a..2e292f08c716 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -4,9 +4,9 @@ * * $RCSfile: DataPointProperties.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2007-09-18 15:00:23 $ + * last change: $Author: vg $ $Date: 2007-10-22 16:53:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -324,11 +324,26 @@ void DataPointProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( + Property( C2U( "LabelSeparator" ), + PROP_DATAPOINT_LABEL_SEPARATOR, + ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::MAYBEDEFAULT )); + + rOutProperties.push_back( Property( C2U( "NumberFormat" ), PROP_DATAPOINT_NUMBER_FORMAT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEVOID )); + + //additional 'PercentageNumberFormat' + rOutProperties.push_back( + Property( C2U( "PercentageNumberFormat" ), + PROP_DATAPOINT_PERCENTAGE_NUMBER_FORMAT, + ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( Property( C2U( "ReferenceDiagramSize" ), @@ -427,8 +442,9 @@ void DataPointProperties::AddDefaultsToMap( sal_False // ShowLegendSymbol )); + PropertyHelper::setPropertyValueDefault< rtl::OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, C2U(" ") ); + //@todo maybe choose a different one here -> should be dynamically that of the attached axis - PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_DATAPOINT_NUMBER_FORMAT, 0 ); PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_ERROR_BAR_X, uno::Reference< beans::XPropertySet >()); PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_ERROR_BAR_Y, uno::Reference< beans::XPropertySet >()); PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_DATAPOINT_PERCENT_DIAGONAL, 0 ); |