diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-17 09:32:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-17 10:11:08 +0100 |
| commit | 0cd21c2bedb2eacc3d0898046d43047bcc3ac1a9 (patch) | |
| tree | aff9e2b018bc13a6a7385e2e7ed56631b2cbe759 /desktop/source/app | |
| parent | f2be92b68d936c6e9d5e8a96deb1580bcbf8c17f (diff) | |
drop intermediate Strings
Change-Id: I7f730d4f5329525eda9f78514dcaa3788149d077
Diffstat (limited to 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/app.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index e4320e6de93d..70036d75abe2 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -363,7 +363,7 @@ OUString GetMsgString( { ResMgr* resMgr = Desktop::GetDesktopResManager(); if ( resMgr ) - return OUString( ResId( nId, *resMgr ) ); + return ResId(nId, *resMgr).toString(); } return aFallbackMsg; } @@ -391,7 +391,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg ) ResMgr* pResMgr = Desktop::GetDesktopResManager(); if ( pResMgr ) - aDiagnosticMessage.append( OUString( ResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS, *pResMgr ) ) ); + aDiagnosticMessage.append( ResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS, *pResMgr).toString() ); else aDiagnosticMessage.appendAscii( "The program cannot be started." ); @@ -399,7 +399,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg ) { aDiagnosticMessage.appendAscii( "\n\n" ); if ( pResMgr ) - aDiagnosticMessage.append( OUString( ResId(STR_INTERNAL_ERRMSG, *pResMgr ) ) ); + aDiagnosticMessage.append( ResId(STR_INTERNAL_ERRMSG, *pResMgr).toString() ); else aDiagnosticMessage.appendAscii( "The following internal error has occurred:\n\n" ); aDiagnosticMessage.append( aInternalErrMsg ); @@ -1169,7 +1169,7 @@ void restartOnMac(bool passArguments) { #if HAVE_FEATURE_MACOSX_SANDBOX (void) passArguments; // avoid warnings ResMgr *resMgr = Desktop::GetDesktopResManager(); - OUString aMessage = OUString( ResId( STR_LO_MUST_BE_RESTARTED, *resMgr ) ); + OUString aMessage = ResId(STR_LO_MUST_BE_RESTARTED, *resMgr).toString(); ErrorBox aRestartBox( NULL, WB_OK, aMessage ); aRestartBox.Execute(); @@ -1494,7 +1494,7 @@ int Desktop::Main() // create title string LanguageTag aLocale( LANGUAGE_SYSTEM); ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( "ofa", aLocale ); - OUString aTitle = pLabelResMgr ? OUString( ResId( RID_APPTITLE, *pLabelResMgr ) ) : OUString(); + OUString aTitle = pLabelResMgr ? ResId(RID_APPTITLE, *pLabelResMgr).toString() : OUString(); delete pLabelResMgr; #ifdef DBG_UTIL |