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 /framework | |
| parent | b18cfdc7cd3755c147970f86d23973f337be01a7 (diff) | |
make ResId::toString a non-static member
Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/classes/fwkresid.hxx | 2 | ||||
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx index c726ed213a23..31c61779fb39 100644 --- a/framework/inc/classes/fwkresid.hxx +++ b/framework/inc/classes/fwkresid.hxx @@ -43,6 +43,8 @@ class FWE_DLLPUBLIC FwkResId : public ResId static ResMgr* GetResManager(); }; +#define FWK_RESSTR(x) FwkResId(x).toString() + } #endif // __FRAMEWORK_CLASSES_FWKRESID diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index fecbf6a5202c..610eef195427 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -3483,8 +3483,8 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) //----------------------------------------------- void AutoRecovery::impl_showFullDiscError() { - rtl::OUString sBtn(ResId::toString(FwkResId(STR_FULL_DISC_RETRY_BUTTON))); - rtl::OUString sMsg(ResId::toString(FwkResId(STR_FULL_DISC_MSG))); + rtl::OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON)); + rtl::OUString sMsg(FWK_RESSTR(STR_FULL_DISC_MSG)); rtl::OUString sBackupURL(SvtPathOptions().GetBackupPath()); INetURLObject aConverter(sBackupURL); |