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 --- desktop/inc/dp_gui_shared.hxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'desktop/inc') diff --git a/desktop/inc/dp_gui_shared.hxx b/desktop/inc/dp_gui_shared.hxx index bd175cb3bfa5..63496c860867 100644 --- a/desktop/inc/dp_gui_shared.hxx +++ b/desktop/inc/dp_gui_shared.hxx @@ -33,13 +33,10 @@ struct DeploymentGuiResMgr : } }; -class DpGuiResId : public ResId +inline OUString DpGuiResId(sal_uInt16 nId) { -public: - explicit DpGuiResId( sal_uInt16 nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {} -}; - -#define DPGUI_RESSTR(i) DpGuiResId(i).toString() + return ResId(nId, *DeploymentGuiResMgr::get()); +} } // namespace dp_gui -- cgit