From a9c5c89f22c2c7c1a43a27f18eda8a2f67eff917 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 3 Sep 2013 09:02:14 +0200
Subject: [PATCH] convert include/svx/pszctrl.hxx from String to OUString

Change-Id: I9ed9781b3beb16b680206dcfcb8eb63b7f31ecb7
---
 include/svx/pszctrl.hxx         |  2 +-
 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);
     }