diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-18 21:14:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-19 15:40:40 +0200 |
| commit | 2155e04d6343638ca9815d394cbc4f78c2b17c3a (patch) | |
| tree | 0378142f6ce9edb63074291aed45527568e7b254 /avmedia/source/inc/mediamisc.hxx | |
| parent | cee02e81cd3b55fb46eacf5db5713e8bf4363bcd (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 'avmedia/source/inc/mediamisc.hxx')
| -rw-r--r-- | avmedia/source/inc/mediamisc.hxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index f6db84cc2ecb..aefc6ac49c0b 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -21,10 +21,17 @@ #define INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX #include <config_features.h> +#include <tools/resid.hxx> -class ResMgr; +namespace avmedia +{ + ResMgr* GetResMgr(); +} -#define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() ) +inline OUString AvmResId(sal_uInt16 nId) +{ + return ResId(nId, * ::avmedia::GetResMgr()); +} #define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC" #ifdef _WIN32 @@ -48,12 +55,6 @@ class ResMgr; #define AVMEDIA_MIMETYPE_JSON "model/vnd.gltf+json" #endif - -namespace avmedia -{ - ResMgr* GetResMgr(); -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |