From 3c8e3212045b66abf5af0976c6b4d09b64e051b0 Mon Sep 17 00:00:00 2001
From: Ivan Timofeev <timofeev.i.s@gmail.com>
Date: Mon, 1 Oct 2012 21:39:33 +0400
Subject: String -> OUString

Change-Id: I1cfd68c37629b4847bad88f54d2866496bc91283
---
 starmath/source/utility.cxx | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'starmath/source')

diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 7cef6dec786e..cde1b35a4769 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -19,7 +19,6 @@
 
 #include <sfx2/app.hxx>
 #include <vcl/virdev.hxx>
-#include <tools/string.hxx>
 #include <tools/tenccvt.hxx>
 #include <osl/thread.h>
 
@@ -156,28 +155,23 @@ bool SmFontPickList::CompareItem(const void *pFirstItem, const void *pSecondItem
     return false;
 }
 
-String SmFontPickList::GetStringItem(void *pItem)
+OUString SmFontPickList::GetStringItem(void *pItem)
 {
-    Font   *pFont;
-    String  aString;
-    const sal_Char *pDelim = ", ";
-
-    pFont = (Font *)pItem;
-
-    aString = pFont->GetName();
+    Font *pFont = (Font *)pItem;
+    OUStringBuffer aString(pFont->GetName());
 
     if (IsItalic( *pFont ))
     {
-        aString.AppendAscii( pDelim );
-        aString += String(SmResId(RID_FONTITALIC));
+        aString.append(", ");
+        aString.append(SM_RESSTR(RID_FONTITALIC));
     }
     if (IsBold( *pFont ))
     {
-        aString.AppendAscii( pDelim );
-        aString += String(SmResId(RID_FONTBOLD));
+        aString.append(", ");
+        aString.append(SM_RESSTR(RID_FONTBOLD));
     }
 
-    return (aString);
+    return aString.makeStringAndClear();
 }
 
 void SmFontPickList::Insert(const Font &rFont)
@@ -213,7 +207,7 @@ void SmFontPickList::WriteTo(SmFontDialog& rDialog) const
 IMPL_LINK( SmFontPickListBox, SelectHdl, ListBox *, /*pListBox*/ )
 {
     sal_uInt16  nPos;
-    String  aString;
+    OUString aString;
 
     nPos = GetSelectEntryPos();
 
-- 
cgit