diff options
Diffstat (limited to 'chart2/source/view')
| -rw-r--r-- | chart2/source/view/charttypes/VSeriesPlotter.cxx | 3 | ||||
| -rw-r--r-- | chart2/source/view/main/ChartView.cxx | 7 | ||||
| -rw-r--r-- | chart2/source/view/main/VDataSeries.cxx | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 57ee304a49b1..6b147b6c4cd5 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -51,6 +51,7 @@ #include "CandleStickChart.hxx" #include "BubbleChart.hxx" #include "NetChart.hxx" +#include <unonames.hxx> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart/TimeUnit.hpp> @@ -1131,7 +1132,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( OUStringBuffer aFormula; sal_Int32 nNumberFormatKey = 0; - xEquationProperties->getPropertyValue( "NumberFormat") >>= nNumberFormatKey; + xEquationProperties->getPropertyValue(CHART_UNONAME_NUMFMT) >>= nNumberFormatKey; if( bShowEquation ) { diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index f04433b11997..4d4c3c8a74ff 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -959,7 +959,7 @@ void SeriesPlotterContainer::setNumberFormatsFromAxes() if( xAxisProp.is()) { sal_Int32 nNumberFormatKey(0); - if( xAxisProp->getPropertyValue( "NumberFormat" ) >>= nNumberFormatKey ) + if( xAxisProp->getPropertyValue(CHART_UNONAME_NUMFMT) >>= nNumberFormatKey ) { aAxesNumberFormats.setFormat( nNumberFormatKey, nDimensionIndex, nAxisIndex ); } @@ -1870,8 +1870,7 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( if( !xSeriesOrPointProp.is() ) return nFormat; - OUString aPropName( "NumberFormat" ); - if( !(xSeriesOrPointProp->getPropertyValue(aPropName) >>= nFormat) ) + if (!(xSeriesOrPointProp->getPropertyValue(CHART_UNONAME_NUMFMT) >>= nFormat)) { uno::Reference< chart2::XChartType > xChartType( DataSeriesHelper::getChartTypeOfSeries( xSeries, xDiagram ) ); @@ -1879,7 +1878,7 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( if( ChartTypeHelper::shouldLabelNumberFormatKeyBeDetectedFromYAxis( xChartType ) ) { uno::Reference< beans::XPropertySet > xAttachedAxisProps( DiagramHelper::getAttachedAxis( xSeries, xDiagram ), uno::UNO_QUERY ); - if( xAttachedAxisProps.is() && ( xAttachedAxisProps->getPropertyValue( aPropName ) >>= nFormat ) ) + if (xAttachedAxisProps.is() && (xAttachedAxisProps->getPropertyValue(CHART_UNONAME_NUMFMT) >>= nFormat)) bFormatFound = true; } if( !bFormatFound ) diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 6fc067688649..bd087c70f92c 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -26,6 +26,7 @@ #include "ContainerHelper.hxx" #include "DataSeriesHelper.hxx" #include "RegressionCurveHelper.hxx" +#include <unonames.hxx> #include <com/sun/star/chart/MissingValueTreatment.hpp> #include <com/sun/star/chart2/Symbol.hpp> @@ -538,7 +539,7 @@ double VDataSeries::getBubble_Size( sal_Int32 index ) const bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPercentage ) const { - OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : OUString("NumberFormat"); + OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : OUString(CHART_UNONAME_NUMFMT); bool bHasNumberFormat = false; uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( nPointIndex )); sal_Int32 nNumberFormat = -1; @@ -548,7 +549,7 @@ bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPerce } sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPercentage ) const { - OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : OUString("NumberFormat"); + OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : OUString(CHART_UNONAME_NUMFMT); sal_Int32 nNumberFormat = -1; uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( nPointIndex )); if( xPointProp.is() ) |