diff options
-rw-r--r-- | include/svx/pszctrl.hxx | 2 | ||||
-rw-r--r-- | svx/source/stbctrls/pszctrl.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx index a4280844099c..4c0fa328ee5a 100644 --- a/include/svx/pszctrl.hxx +++ b/include/svx/pszctrl.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC SvxPosSizeStatusBarControl : public SfxStatusBarControl { private: SvxPosSizeStatusBarControl_Impl* pImp; - SVX_DLLPRIVATE String GetMetricStr_Impl( long nVal ); + SVX_DLLPRIVATE OUString GetMetricStr_Impl( long nVal ); public: SFX_DECL_STATUSBAR_CONTROL(); diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 1dcd3e584beb..537ac12579cc 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -59,29 +59,29 @@ <SvxPosSizeStatusBarControl::Paint(const UserDrawEvent&)> */ -String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) +OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) { // deliver and set the Metric of the application FieldUnit eOutUnit = SfxModule::GetModuleFieldUnit( getFrameInterface() ); FieldUnit eInUnit = FUNIT_100TH_MM; - String sMetric; + OUString sMetric; const sal_Unicode cSep = Application::GetSettings().GetLocaleDataWrapper().getNumDecimalSep()[0]; sal_Int64 nConvVal = MetricField::ConvertValue( nVal * 100, 0L, 0, eInUnit, eOutUnit ); if ( nConvVal < 0 && ( nConvVal / 100 == 0 ) ) - sMetric += '-'; + sMetric += "-"; sMetric += OUString::number(nConvVal / 100); if( FUNIT_NONE != eOutUnit ) { - sMetric += cSep; + sMetric += OUString(cSep); sal_Int64 nFract = nConvVal % 100; if ( nFract < 0 ) nFract *= -1; if ( nFract < 10 ) - sMetric += '0'; + sMetric += "0"; sMetric += OUString::number(nFract); } |