diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 15:51:36 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 15:51:36 +0000 |
| commit | a9b71879c3538fdf78325a7b290bca3d3383ea51 (patch) | |
| tree | c200dcccdf642e8512e64da2634443b9680b907b /chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx | |
| parent | f3c37daaaade78603b6fac08105ed0c18453f4f4 (diff) | |
INTEGRATION: CWS chart14 (1.11.2); FILE MERGED
2007/10/11 13:29:16 iha 1.11.2.3: #i82383#, #i82424# number format for data labels - preselect automatic number format - handle mixed states
2007/10/11 10:07:49 iha 1.11.2.2: #i82383#, #i82424# number format for data labels - preselect automatic number format
2007/10/01 15:13:37 iha 1.11.2.1: #i37792# #i79194# numberformat for data label - select automatic default in dialog
Diffstat (limited to 'chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx')
| -rw-r--r-- | chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index df828e6ae6ed..308dc417432a 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.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2007-09-18 14:56:09 $ + * last change: $Author: vg $ $Date: 2007-10-22 16:51:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,6 +47,8 @@ #include "TitleHelper.hxx" #include "TitleItemConverter.hxx" #include "AxisHelper.hxx" +#include "chartview/ExplicitValueProvider.hxx" +#include "DiagramHelper.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -143,6 +145,12 @@ AllDataLabelItemConverter::AllDataLabelItemConverter( { uno::Reference< beans::XPropertySet > xObjectProperties( *aIt, uno::UNO_QUERY); uno::Reference< uno::XComponentContext> xContext(0);//do not need Context for label properties + + sal_Int32 nNumberFormat=ExplicitValueProvider::getExplicitNumberFormatKeyForLabel( xObjectProperties, *aIt, -1/*nPointIndex*/, + uno::Reference< beans::XPropertySet >( DiagramHelper::getAttachedAxis( *aIt, ChartModelHelper::findDiagram( xChartModel ) ), uno::UNO_QUERY ) ); + sal_Int32 nPercentNumberFormat=ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForLabel( + xObjectProperties,uno::Reference< util::XNumberFormatsSupplier >(xChartModel, uno::UNO_QUERY)); + m_aConverters.push_back( new ::chart::wrapper::DataPointItemConverter( xChartModel, xContext, xObjectProperties, rItemPool, rDrawModel, NULL, @@ -152,7 +160,8 @@ AllDataLabelItemConverter::AllDataLabelItemConverter( true, /*bDataSeries*/ false, /*bUseSpecialFillColor*/ 0, /*nSpecialFillColor*/ - true /*bOverwriteLabelsForAttributedDataPointsAlso*/ + true /*bOverwriteLabelsForAttributedDataPointsAlso*/, + nNumberFormat, nPercentNumberFormat )); } } |