summaryrefslogtreecommitdiff
path: root/include/sfx2/sfxresid.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-05-18 21:14:00 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-19 15:40:40 +0200
commit2155e04d6343638ca9815d394cbc4f78c2b17c3a (patch)
tree0378142f6ce9edb63074291aed45527568e7b254 /include/sfx2/sfxresid.hxx
parentcee02e81cd3b55fb46eacf5db5713e8bf4363bcd (diff)
make string translation loading more uniform
change various ResId classes that use conversion operator to OUString to functions that return a OUString drop various defines drop unnecessary toString calls Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92 Reviewed-on: https://gerrit.libreoffice.org/37817 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/sfx2/sfxresid.hxx')
-rw-r--r--include/sfx2/sfxresid.hxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/sfx2/sfxresid.hxx b/include/sfx2/sfxresid.hxx
index f66fc8014a2f..945d79939cdb 100644
--- a/include/sfx2/sfxresid.hxx
+++ b/include/sfx2/sfxresid.hxx
@@ -22,15 +22,16 @@
#include <sfx2/dllapi.h>
#include <tools/resid.hxx>
-class SFX2_DLLPUBLIC SfxResId: public ResId
+struct SFX2_DLLPUBLIC SfxResMgr
{
-public:
- SfxResId( sal_uInt16 nId );
static ResMgr* GetResMgr();
static void DeleteResMgr();
};
-#define SFX2_RESSTR(x) SfxResId(x).toString()
+inline OUString SfxResId(sal_uInt16 nId)
+{
+ return ResId(nId, *SfxResMgr::GetResMgr());
+}
#endif