diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-07 10:06:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-07 10:06:27 +0000 |
| commit | 30c3712c0ece4d264798f7741721682296dc60a7 (patch) | |
| tree | 0dbe42ca60c0c2947fdda72667a0dfdce5d85933 /desktop/source/pkgchk/unopkg/unopkg_misc.cxx | |
| parent | ad943a16333d211e3ba971f0b7e8d42963b0b223 (diff) | |
INTEGRATION: CWS jl91_DEV300 (1.12.82); FILE MERGED
2008/02/27 12:59:41 jl 1.12.82.1: #i79333# added localized string for the case when there is already an unopkg running
Diffstat (limited to 'desktop/source/pkgchk/unopkg/unopkg_misc.cxx')
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 95b88491960b..57eedc03b280 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unopkg_misc.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: ihi $ $Date: 2007-11-23 13:24:35 $ + * last change: $Author: kz $ $Date: 2008-03-07 11:06:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -460,6 +460,7 @@ Reference<XComponentContext> getUNO( { if (! s_lockfile.check( 0 )) { + String sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get())); if (bGui) { //We show a message box or print to the console that there @@ -470,8 +471,7 @@ Reference<XComponentContext> getUNO( throw RuntimeException( OUSTR("Cannot initialize VCL!"), NULL ); { - ResId warnId(WARNINGBOX_CONCURRENTINSTANCE,*DeploymentGuiResMgr::get() ); - WarningBox warn(NULL, warnId); + WarningBox warn(NULL, WB_OK | WB_DEF_OK, sMsg); warn.SetText(::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME).get<OUString>()); warn.SetIcon(0); @@ -481,8 +481,8 @@ Reference<XComponentContext> getUNO( } else { - //ToDo issue i79333 - fprintf(stdout,"You need to close the already opened Extension Manager to continue.\n"); + ::rtl::OString soMsg = ::rtl::OUStringToOString(sMsg, osl_getThreadTextEncoding()); + fprintf(stdout,"%s\n", soMsg.getStr()); } throw RuntimeException( |