From 2155e04d6343638ca9815d394cbc4f78c2b17c3a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 18 May 2017 21:14:00 +0100 Subject: make string translation loading more uniform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sw/inc/swtypes.hxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'sw/inc') diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 9c40203b5402..5ad4445bebdc 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SW_INC_SWTYPES_HXX #define INCLUDED_SW_INC_SWTYPES_HXX #include +#include #include #include #include @@ -132,10 +133,12 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm #define INIT_SEQ_FLDTYPES 4 extern ResMgr* pSwResMgr; - // defined in sw/source/uibase/app/swmodule.cxx for the sw library and in - // sw/source/ui/dialog/swdialmgr.cxx for the swui library -#define SW_RES(i) ResId(i,*pSwResMgr) -#define SW_RESSTR(i) SW_RES(i).toString() +// defined in sw/source/uibase/app/swmodule.cxx for the sw library and in +// sw/source/ui/dialog/swdialmgr.cxx for the swui library +inline OUString SwResId(sal_uInt16 nId) +{ + return ResId(nId, *pSwResMgr); +} css::uno::Reference< css::linguistic2::XSpellChecker1 > GetSpellChecker(); css::uno::Reference< css::linguistic2::XHyphenator > GetHyphenator(); -- cgit