diff options
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/dialogs/ObjectNameProvider.cxx | 6 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/VSeriesPlotter.cxx | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index d61da98eab4b..89106b0a4795 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -567,8 +567,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe OUString aXName ("x"), aYName ("f(x)"); const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper(); const OUString& aNumDecimalSep = rLocaleDataWrapper.getNumDecimalSep(); - assert(aNumDecimalSep.getLength() > 0); - sal_Unicode cDecSeparator = aNumDecimalSep.getStr()[0]; + sal_Unicode cDecSeparator = aNumDecimalSep[0]; uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY ); if ( xProperties.is()) @@ -668,8 +667,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper(); const OUString& aNumDecimalSep = rLocaleDataWrapper.getNumDecimalSep(); - assert(aNumDecimalSep.getLength() > 0); - sal_Unicode cDecSeparator = aNumDecimalSep.getStr()[0]; + sal_Unicode cDecSeparator = aNumDecimalSep[0]; OUString aWildcard( "%AVERAGE_VALUE" ); sal_Int32 nIndex = aRet.indexOf( aWildcard ); diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index ba3ac187a80c..822523d3266b 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -396,7 +396,7 @@ OUString VSeriesPlotter::getLabelTextForValue( VDataSeries const & rDataSeries const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper(); const OUString& aNumDecimalSep = rLocaleDataWrapper.getNumDecimalSep(); assert(aNumDecimalSep.getLength() > 0); - sal_Unicode cDecSeparator = aNumDecimalSep.getStr()[0]; + sal_Unicode cDecSeparator = aNumDecimalSep[0]; aNumber = ::rtl::math::doubleToUString( fValue, rtl_math_StringFormat_G /*rtl_math_StringFormat*/ , 3/*DecPlaces*/ , cDecSeparator ); } @@ -1286,8 +1286,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( { const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper(); const OUString& aNumDecimalSep = rLocaleDataWrapper.getNumDecimalSep(); - assert(aNumDecimalSep.getLength() > 0); - sal_Unicode aDecimalSep = aNumDecimalSep.getStr()[0]; + sal_Unicode aDecimalSep = aNumDecimalSep[0]; aFormula.append( ::rtl::math::doubleToUString( fR*fR, rtl_math_StringFormat_G, 4, aDecimalSep, true )); } |