From 104261010aa5ccbb7df4a82a3a3cafcfb0591fa7 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 4 Jul 2012 23:58:05 +0100
Subject: some UniString->rtl::OUString

Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3
---
 scaddins/source/analysis/analysishelper.cxx | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'scaddins/source/analysis')

diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 071941b162b6..6b4309a6f3c7 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1774,35 +1774,30 @@ sal_Bool Complex::ParseString( const STRING& rStr, Complex& rCompl )
 
 STRING Complex::GetString() const THROWDEF_RTE_IAE
 {
-    static const String aI( 'i' );
-    static const String aJ( 'j' );
-    static const String aPlus( '+' );
-    static const String aMinus( '-' );
-
     CHK_FINITE(r);
     CHK_FINITE(i);
-    STRING aRet;
+    rtl::OUStringBuffer aRet;
 
     bool bHasImag = i != 0.0;
     bool bHasReal = !bHasImag || (r != 0.0);
 
     if( bHasReal )
-        aRet = ::GetString( r );
+        aRet.append(::GetString( r ));
     if( bHasImag )
     {
         if( i == 1.0 )
         {
             if( bHasReal )
-                aRet += aPlus;
+                aRet.append('+');
         }
         else if( i == -1.0 )
-            aRet += aMinus;
+            aRet.append('-');
         else
-            aRet += ::GetString( i, bHasReal );
-        aRet += (c != 'j') ? aI : aJ;
+            aRet.append(::GetString( i, bHasReal ));
+        aRet.append((c != 'j') ? 'i' : 'j');
     }
 
-    return aRet;
+    return aRet.makeStringAndClear();
 }
 
 
-- 
cgit