summaryrefslogtreecommitdiff
path: root/include/svtools/svtresid.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/svtools/svtresid.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/svtools/svtresid.hxx')
-rw-r--r--include/svtools/svtresid.hxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/svtools/svtresid.hxx b/include/svtools/svtresid.hxx
index f238b298c2c0..374406b1e455 100644
--- a/include/svtools/svtresid.hxx
+++ b/include/svtools/svtresid.hxx
@@ -24,14 +24,16 @@
#include <tools/resid.hxx>
#include <com/sun/star/lang/Locale.hpp>
-class SVT_DLLPUBLIC SvtResId: public ResId
+struct SVT_DLLPUBLIC SvtResMgr
{
-public:
- SvtResId(sal_uInt16 nId);
+ static ResMgr* GetResMgr();
static void DeleteResMgr();
};
-#define SVT_RESSTR(i) SvtResId(i).toString()
+inline OUString SvtResId(sal_uInt16 nId)
+{
+ return ResId(nId, *SvtResMgr::GetResMgr());
+}
#endif // INCLUDED_SVTOOLS_SVTRESID_HXX