diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-10-01 21:39:33 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-10-02 20:54:07 +0400 |
| commit | 3c8e3212045b66abf5af0976c6b4d09b64e051b0 (patch) | |
| tree | 5d9a80140cae8863ad78794e6224d1df018443dc /starmath | |
| parent | 6fa4242439466be61c159d54cd85c2c44b631c32 (diff) | |
String -> OUString
Change-Id: I1cfd68c37629b4847bad88f54d2866496bc91283
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/utility.hxx | 4 | ||||
| -rw-r--r-- | starmath/source/utility.cxx | 24 |
2 files changed, 11 insertions, 17 deletions
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 52aa72e60928..1184c8522afd 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -127,7 +127,7 @@ protected: virtual bool CompareItem(const void *pFirstItem, const void *pSecondItem) const = 0; - virtual String GetStringItem(void *pItem) = 0; + virtual OUString GetStringItem(void *pItem) = 0; void *GetPtr(sal_uInt16 nPos) const { return SfxPtrArr::GetObject(nPos); } void *&GetPtr(sal_uInt16 nPos) { return SfxPtrArr::GetObject(nPos); } @@ -172,7 +172,7 @@ protected: virtual bool CompareItem(const void *pFirstItem, const void *pSecondItem) const; - virtual String GetStringItem(void *pItem); + virtual OUString GetStringItem(void *pItem); public: SmFontPickList() 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(); |