diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-25 23:10:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-26 13:34:03 +0100 |
| commit | d9a00ace2ce3423c1ac08eee0bd1fd36dace8d3e (patch) | |
| tree | 2a3900905792268c39f0c9596a5eb9ecdc8a3c61 /basic | |
| parent | 4f25eb2c4eb7b5ce265eefe25a5ab84a39daf574 (diff) | |
tidy some resource strings
Change-Id: I611a276d048121084ec842d062129e042f3baea5
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sb.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/basrdll.cxx | 3 | ||||
| -rw-r--r-- | basic/source/sbx/sbxscan.cxx | 28 |
3 files changed, 16 insertions, 17 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 84d747192da4..5aae4d9f375c 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1569,7 +1569,7 @@ struct BasicStringList_Impl : private Resource : Resource( rErrIdP ),aResId(nId, *rErrIdP.GetResMgr() ){} ~BasicStringList_Impl() { FreeResource(); } - String GetString(){ return String( aResId ); } + String GetString(){ return aResId.toString(); } sal_Bool IsErrorTextAvailable( void ) { return IsAvailableRes(aResId.SetRT(RSC_STRING)); } }; diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index 24add65c00cc..ffd7292e28de 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -87,8 +87,7 @@ void BasicDLL::BasicBreak() { bJustStopping = sal_True; StarBASIC::Stop(); - String aMessageStr( BasResId( IDS_SBERR_TERMINATED ) ); - InfoBox( 0, aMessageStr ).Execute(); + InfoBox( 0, BasResId(IDS_SBERR_TERMINATED).toString() ).Execute(); bJustStopping = sal_False; } } diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index 8bbe8b7813bb..de67b5577c6e 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -877,20 +877,20 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const // initialize the Basic-formater help object: // get resources for predefined output // of the Format()-command, e. g. for "On/Off" - String aOnStrg = String( SbxValueFormatResId( - STR_BASICKEY_FORMAT_ON ) ); - String aOffStrg = String( SbxValueFormatResId( - STR_BASICKEY_FORMAT_OFF) ); - String aYesStrg = String( SbxValueFormatResId( - STR_BASICKEY_FORMAT_YES) ); - String aNoStrg = String( SbxValueFormatResId( - STR_BASICKEY_FORMAT_NO) ); - String aTrueStrg = String( SbxValueFormatResId( - STR_BASICKEY_FORMAT_TRUE) ); - String aFalseStrg = String( SbxValueFormatResId( - STR_BASICKEY_FORMAT_FALSE) ); - String aCurrencyFormatStrg = String( SbxValueFormatResId( - STR_BASICKEY_FORMAT_CURRENCY) ); + rtl::OUString aOnStrg = SbxValueFormatResId( + STR_BASICKEY_FORMAT_ON).toString(); + rtl::OUString aOffStrg = SbxValueFormatResId( + STR_BASICKEY_FORMAT_OFF).toString(); + rtl::OUString aYesStrg = SbxValueFormatResId( + STR_BASICKEY_FORMAT_YES).toString(); + rtl::OUString aNoStrg = SbxValueFormatResId( + STR_BASICKEY_FORMAT_NO).toString(); + rtl::OUString aTrueStrg = SbxValueFormatResId( + STR_BASICKEY_FORMAT_TRUE).toString(); + rtl::OUString aFalseStrg = SbxValueFormatResId( + STR_BASICKEY_FORMAT_FALSE).toString(); + rtl::OUString aCurrencyFormatStrg = SbxValueFormatResId( + STR_BASICKEY_FORMAT_CURRENCY).toString(); rAppData.pBasicFormater = new SbxBasicFormater( cComma,c1000,aOnStrg,aOffStrg, |