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-21 19:28:59 +0200 |
| commit | d666c2f87d56da1f4dd3d421665ac3078c447a17 (patch) | |
| tree | fb837b5b12955d94c06e1abdb0ccb09ceb901607 /desktop/inc | |
| parent | d3ba63909740262e0cd64648e2eb00096b4626d2 (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>
(cherry picked from commit 2155e04d6343638ca9815d394cbc4f78c2b17c3a)
drop toString
Change-Id: I0f67c8931523bbe90bfbc8cc7d9a5bd523758ee5
(cherry picked from commit 8b1101023f01b2c7478a014b5ead73ada4fd4861)
pNameResId is unused
Change-Id: Ic1fe6abc7066517187695266c4d1a0888b41ffe7
(cherry picked from commit c2667d7ff558a1b7bf83e694909465f00d1a16f6)
Reviewed-on: https://gerrit.libreoffice.org/37843
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.hxx | 9 |
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 |