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 /svtools/source/misc | |
| parent | 4f25eb2c4eb7b5ce265eefe25a5ab84a39daf574 (diff) | |
tidy some resource strings
Change-Id: I611a276d048121084ec842d062129e042f3baea5
Diffstat (limited to 'svtools/source/misc')
| -rw-r--r-- | svtools/source/misc/ehdl.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/misc/imagemgr.cxx | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index d78745c642a7..c56cb894abc5 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -90,7 +90,7 @@ static sal_uInt16 aWndFunc( break; } - String aErr(SvtResId(STR_ERR_HDLMESS)); + String aErr(SvtResId(STR_ERR_HDLMESS).toString()); String aAction(rAction); if ( aAction.Len() ) aAction += String::CreateFromAscii( ":\n" ); @@ -264,7 +264,7 @@ class ResString: public String //------------------------------------------------------------------------- ResString::ResString(ResId & rId): - String(rId.SetAutoRelease(sal_False)), + String(rId.SetAutoRelease(sal_False).toString()), nFlags(0) { ResMgr * pResMgr = rId.GetResMgr(); @@ -371,7 +371,7 @@ sal_Bool SfxErrorHandler::GetErrorString( SolarMutexGuard aGuard; sal_Bool bRet = sal_False; - rStr=String(SvtResId(RID_ERRHDL_CLASS)); + rStr=SvtResId(RID_ERRHDL_CLASS).toString(); ResId aResId(nId, *pMgr); { diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index e5256bd10ead..1e65ecdd40ea 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -457,13 +457,12 @@ static String GetDescriptionByFactory_Impl( const String& rFactory ) else if ( rFactory.EqualsIgnoreCaseAscii( "sdatabase", 0, 9 ) ) nResId = STR_DESCRIPTION_FACTORY_DATABASE; - String aRet; if ( nResId ) { SolarMutexGuard aGuard; - aRet = String( SvtResId( nResId ) ); + return SvtResId(nResId).toString(); } - return aRet; + return rtl::OUString(); } static sal_uInt16 GetFolderDescriptionId_Impl( const String& rURL ) @@ -588,7 +587,7 @@ String SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObje sDescription += '-'; } SolarMutexGuard aGuard; - sDescription += String( SvtResId( nResId ) ); + sDescription += SvtResId(nResId).toString(); } DBG_ASSERT( sDescription.Len() > 0, "file without description" ); @@ -667,8 +666,7 @@ String SvFileInformationManager::GetFolderDescription( const svtools::VolumeInfo else if ( rInfo.m_bIsRemoveable || rInfo.m_bIsVolume ) nResId = STR_DESCRIPTION_LOCALE_VOLUME; - String sDescription = String( SvtResId( nResId ) ); - return sDescription; + return SvtResId(nResId).toString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |