summaryrefslogtreecommitdiffstats
path: root/desktop/inc
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 /desktop/inc
parentooxmlexport: roundtrip tdf#103975's unit tests (diff)
downloadcore-2155e04d6343638ca9815d394cbc4f78c2b17c3a.tar.gz
core-2155e04d6343638ca9815d394cbc4f78c2b17c3a.zip
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 'desktop/inc')
-rw-r--r--desktop/inc/dp_gui_shared.hxx9
1 files changed, 3 insertions, 6 deletions
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