diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-29 23:36:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-30 11:22:09 +0100 |
| commit | 8a0685d49f679d6f98de2f357f1ec74590573852 (patch) | |
| tree | 97eb05105a45186049c1c3dad20233c29747ed9c /starmath | |
| parent | b18cfdc7cd3755c147970f86d23973f337be01a7 (diff) | |
make ResId::toString a non-static member
Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/smmod.hxx | 2 | ||||
| -rw-r--r-- | starmath/source/dialog.cxx | 4 | ||||
| -rw-r--r-- | starmath/source/parse.cxx | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index a75aee02c0a5..43b45392a9d1 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -69,6 +69,8 @@ public: SmResId(sal_uInt16 nId); }; +#define SM_RESSTR(x) SmResId(x).toString() + class SmNamesArray : public Resource { ResStringArray aNamesAry; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 0871fec14a51..ec92a045e7f3 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -699,7 +699,7 @@ SmCategoryDesc::SmCategoryDesc(const ResId& rResId, sal_uInt16 nCategoryIdx) : { if (IsAvailableRes(ResId(1,*rResId.GetResMgr()).SetRT(RSC_STRING))) { - Name = ResId::toString(ResId(1,*rResId.GetResMgr())); + Name = ResId(1,*rResId.GetResMgr()).toString(); int i; for (i = 0; i < 4; i++) @@ -708,7 +708,7 @@ SmCategoryDesc::SmCategoryDesc(const ResId& rResId, sal_uInt16 nCategoryIdx) : if (IsAvailableRes(ResId(nI2,*rResId.GetResMgr()).SetRT(RSC_STRING))) { - Strings [i] = new rtl::OUString(ResId::toString(ResId(nI2,*rResId.GetResMgr()))); + Strings [i] = new rtl::OUString(ResId(nI2,*rResId.GetResMgr()).toString()); Graphics [i] = new Bitmap(ResId(10*nI2,*rResId.GetResMgr())); } else diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index b386cf36fbab..9ecd5ae1a370 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -2518,7 +2518,7 @@ size_t SmParser::AddError(SmParseError Type, SmNode *pNode) default: nRID = RID_ERR_UNKOWN; } - pErrDesc->Text += SmResId(nRID); + pErrDesc->Text += SM_RESSTR(nRID); m_aErrDescList.push_back( pErrDesc ); |