diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-24 21:20:24 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-25 15:37:19 +0000 |
| commit | 0c5ed3541bd857060b046dace291bb7e971dcc73 (patch) | |
| tree | a98458036e2d91dd559f436271b4defae3c43b2c | |
| parent | 1d4e0d9ec5b3781f8ab778e3e1630db3c2c39c4b (diff) | |
String->rtl::OUString
| -rw-r--r-- | starmath/inc/dialog.hxx | 8 | ||||
| -rw-r--r-- | starmath/source/dialog.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 316d1fb7ca62..41f6b70a84bd 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -199,8 +199,8 @@ public: class SmCategoryDesc : public Resource { - XubString Name; - XubString *Strings[4]; + rtl::OUString Name; + rtl::OUString *Strings[4]; Bitmap *Graphics[4]; /* regular bitmaps */ sal_uInt16 Minimum[4]; sal_uInt16 Maximum[4]; @@ -210,8 +210,8 @@ public: SmCategoryDesc(const ResId &rResId, sal_uInt16 nCategoryIdx); ~SmCategoryDesc(); - const XubString & GetName() const { return Name; } - const XubString * GetString(sal_uInt16 Index) const { return Strings[Index]; } + const rtl::OUString& GetName() const { return Name; } + const rtl::OUString* GetString(sal_uInt16 Index) const { return Strings[Index]; } sal_uInt16 GetMinimum(sal_uInt16 Index) { return Minimum[Index]; } sal_uInt16 GetMaximum(sal_uInt16 Index) { return Maximum[Index]; } sal_uInt16 GetValue(sal_uInt16 Index) const { return Value[Index]; } diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index c46dbc2498a6..bc9037b43b1f 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -672,7 +672,7 @@ SmCategoryDesc::SmCategoryDesc(const ResId& rResId, sal_uInt16 nCategoryIdx) : 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())); } else |