diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-05-28 19:41:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-17 11:55:13 +0200 |
| commit | 9881bea8d41997fb46579eb5f0314300159c96cc (patch) | |
| tree | f52daa7055d2d28959e2d1ad576d963b7c0d3b2d /chart2 | |
| parent | ec4034c4a4f23574401ba2a74b635d9ed4befbc8 (diff) | |
remove unnecessary use of OUString::getStr
Change-Id: I3d13e1c0bb6aa4a7aacc463198747c1368ebc9b4
Reviewed-on: https://gerrit.libreoffice.org/38114
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
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 )); } |