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 /sw/source/uibase/utlui/uiitems.cxx | |
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 'sw/source/uibase/utlui/uiitems.cxx')
-rw-r--r-- | sw/source/uibase/utlui/uiitems.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index 2f4ec2022413..e7656572ed60 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -71,7 +71,7 @@ bool SwPageFootnoteInfoItem::GetPresentation const SwTwips nHght = GetPageFootnoteInfo().GetHeight(); if ( nHght ) { - rText = SW_RESSTR( STR_MAX_FTN_HEIGHT ) + " " + + rText = SwResId( STR_MAX_FTN_HEIGHT ) + " " + ::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ) + " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } |