diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-04-13 07:45:19 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-04-13 07:45:19 +0000 |
| commit | 7ffaf5395c1d8329f944cc115b53eebc9db6d0a1 (patch) | |
| tree | 341fab961051124c875f121645f95a25ca2a6a30 /desktop | |
| parent | 5e056b9e8711cf535fed36752a86fd468709a024 (diff) | |
INTEGRATION: CWS visibility03 (1.167.8); FILE MERGED
2005/04/06 15:16:37 mhu 1.167.8.3: RESYNC: (1.172-1.173); FILE MERGED
2005/03/24 21:42:15 mhu 1.167.8.2: RESYNC: (1.167-1.172); FILE MERGED
2005/03/07 19:04:09 mhu 1.167.8.1: #i40092# Fixed string ctor (ResId) usage.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index a3f31170b1b4..6c1537d28715 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.173 $ + * $Revision: 1.174 $ * - * last change: $Author: rt $ $Date: 2005-03-29 14:59:14 $ + * last change: $Author: obo $ $Date: 2005-04-13 08:45:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -420,7 +420,7 @@ OUString Desktop::GetMsgString( USHORT nId, const OUString& aFaultBackMsg ) if ( !pResMgr ) return aFaultBackMsg; else - return OUString( ResId( nId, pResMgr )); + return OUString( String( ResId( nId, pResMgr ))); } OUString MakeStartupErrorMessage(OUString const & aErrorMessage) @@ -429,7 +429,7 @@ OUString MakeStartupErrorMessage(OUString const & aErrorMessage) ResMgr* pResMgr = Desktop::GetDesktopResManager(); if ( pResMgr ) - aDiagnosticMessage.append( OUString(ResId(STR_BOOTSTRAP_ERR_CANNOT_START, pResMgr)) ); + aDiagnosticMessage.append( OUString(String(ResId(STR_BOOTSTRAP_ERR_CANNOT_START, pResMgr))) ); else aDiagnosticMessage.appendAscii( "The program cannot be started." ); @@ -446,7 +446,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg ) ResMgr* pResMgr = Desktop::GetDesktopResManager(); if ( pResMgr ) - aDiagnosticMessage.append( OUString(ResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS, pResMgr )) ); + aDiagnosticMessage.append( OUString(String(ResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS, pResMgr ))) ); else aDiagnosticMessage.appendAscii( "The program cannot be started." ); @@ -454,7 +454,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg ) { aDiagnosticMessage.appendAscii( "\n\n" ); if ( pResMgr ) - aDiagnosticMessage.append( OUString(ResId(STR_INTERNAL_ERRMSG, pResMgr )) ); + aDiagnosticMessage.append( OUString(String(ResId(STR_INTERNAL_ERRMSG, pResMgr ))) ); else aDiagnosticMessage.appendAscii( "The following internal error has occured:\n\n" ); aDiagnosticMessage.append( aInternalErrMsg ); |