From 6922a0b190e3877cfae1ca08bfe86e0a010e9d86 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Mon, 26 Nov 2012 18:23:31 -0600
Subject: String => OUString in svl numfmuno + clean-up legacy of
 GetPreviewString

Change-Id: I20f080b76b864208f0706bef9e87cb299f3845aa
---
 svx/source/items/numfmtsh.cxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'svx')

diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 397bde069829..9ba7e2a75d64 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -428,9 +428,11 @@ void SvxNumberFormatShell::MakePreviewString( const String& rFormatStr,
     if ( nExistingFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
     {
         //  real preview - not implemented in NumberFormatter for text formats
+        OUString sTempOut(rPreviewStr);
 
-        pFormatter->GetPreviewString( rFormatStr, nValNum, rPreviewStr,
+        pFormatter->GetPreviewString( rFormatStr, nValNum, sTempOut,
                                       &rpFontColor, eCurLanguage, bUseStarFormat );
+        rPreviewStr = sTempOut;
     }
     else
     {
@@ -1260,7 +1262,9 @@ void SvxNumberFormatShell::MakePrevStringFromVal(
         double  nValue)
 {
     rpFontColor = NULL;
-    pFormatter->GetPreviewString( rFormatStr, nValue, rPreviewStr, &rpFontColor, eCurLanguage );
+    OUString sTempOut(rPreviewStr);
+    pFormatter->GetPreviewString( rFormatStr, nValue, sTempOut, &rpFontColor, eCurLanguage );
+    rPreviewStr = sTempOut;
 }
 
 /*************************************************************************
-- 
cgit