mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

String->rtl::OUString

Browse Source
This commit is contained in:
Caolán McNamara
2012-01-24 21:20:24 +00:00
parent 1d4e0d9ec5
commit 0c5ed3541b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
starmath/inc/dialog.hxx
View File

@@ -199,8 +199,8 @@ public:
class SmCategoryDesc : public Resource class SmCategoryDesc : public Resource
{ {
XubString Name; rtl::OUString Name;
XubString *Strings[4]; rtl::OUString *Strings[4];
Bitmap *Graphics[4]; /* regular bitmaps */ Bitmap *Graphics[4]; /* regular bitmaps */
sal_uInt16 Minimum[4]; sal_uInt16 Minimum[4];
sal_uInt16 Maximum[4]; sal_uInt16 Maximum[4];
@@ -210,8 +210,8 @@ public:
SmCategoryDesc(const ResId &rResId, sal_uInt16 nCategoryIdx); SmCategoryDesc(const ResId &rResId, sal_uInt16 nCategoryIdx);
~SmCategoryDesc(); ~SmCategoryDesc();
const XubString & GetName() const { return Name; } const rtl::OUString& GetName() const { return Name; }
const XubString * GetString(sal_uInt16 Index) const { return Strings[Index]; } const rtl::OUString* GetString(sal_uInt16 Index) const { return Strings[Index]; }
sal_uInt16 GetMinimum(sal_uInt16 Index) { return Minimum[Index]; } sal_uInt16 GetMinimum(sal_uInt16 Index) { return Minimum[Index]; }
sal_uInt16 GetMaximum(sal_uInt16 Index) { return Maximum[Index]; } sal_uInt16 GetMaximum(sal_uInt16 Index) { return Maximum[Index]; }
sal_uInt16 GetValue(sal_uInt16 Index) const { return Value[Index]; } sal_uInt16 GetValue(sal_uInt16 Index) const { return Value[Index]; }

2
starmath/source/dialog.cxx
View File

@@ -672,7 +672,7 @@ SmCategoryDesc::SmCategoryDesc(const ResId& rResId, sal_uInt16 nCategoryIdx) :
if (IsAvailableRes(ResId(nI2,*rResId.GetResMgr()).SetRT(RSC_STRING))) if (IsAvailableRes(ResId(nI2,*rResId.GetResMgr()).SetRT(RSC_STRING)))
{ {
Strings [i] = new XubString(ResId(nI2,*rResId.GetResMgr())); Strings [i] = new rtl::OUString(ResId::toString(ResId(nI2,*rResId.GetResMgr())));
Graphics [i] = new Bitmap(ResId(10*nI2,*rResId.GetResMgr())); Graphics [i] = new Bitmap(ResId(10*nI2,*rResId.GetResMgr()));
} }
else else