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 --- basic/source/runtime/basrdll.cxx | 2 +- basic/source/sbx/sbxscan.cxx | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'basic') diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index f2f2a68961ea..c9e4a153338d 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -104,7 +104,7 @@ void BasicDLL::BasicBreak() { bJustStopping = true; StarBASIC::Stop(); - ScopedVclPtrInstance(nullptr, BasResId(IDS_SBERR_TERMINATED).toString())->Execute(); + ScopedVclPtrInstance(nullptr, BasResId(IDS_SBERR_TERMINATED))->Execute(); bJustStopping = false; } } diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index 5e73e62f2db7..8a5d59573d2d 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -826,13 +826,13 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const // initialize the Basic-formater help object: // get resources for predefined output // of the Format()-command, e. g. for "On/Off" - OUString aOnStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_ON).toString(); - OUString aOffStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_OFF).toString(); - OUString aYesStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_YES).toString(); - OUString aNoStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_NO).toString(); - OUString aTrueStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_TRUE).toString(); - OUString aFalseStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_FALSE).toString(); - OUString aCurrencyFormatStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_CURRENCY).toString(); + OUString aOnStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_ON); + OUString aOffStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_OFF); + OUString aYesStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_YES); + OUString aNoStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_NO); + OUString aTrueStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_TRUE); + OUString aFalseStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_FALSE); + OUString aCurrencyFormatStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_CURRENCY); rAppData.pBasicFormater = o3tl::make_unique( cComma,c1000,aOnStrg,aOffStrg, -- cgit