strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS jl131

Browse source 
2009-09-02 16:42:40 +0200 jl  r275720 : #i97896#
2009-08-31 13:01:53 +0200 jl  r275599 : CWS-TOOLING: rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56)
2009-07-31 14:35:30 +0200 jl  r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone: DEV300:m53)
2009-07-23 14:20:32 +0200 jl  r274272 : #i79839# better error text when trying to modify shared layer without having write permission, eg. unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared
2009-07-22 16:38:02 +0200 jl  r274252 : #i97896# localize error message for lock file
2009-07-22 16:37:22 +0200 jl  r274251 : #i80462# unprecise wording in updatedialog
2009-07-22 16:36:06 +0200 jl  r274250 : #i97896# localize error message for lock file
2009-07-22 16:35:20 +0200 jl  r274249 : #i97896# localize error message for lock file
2009-07-22 15:07:30 +0200 jl  r274242 : #i98873# minimum java version is 1.5 since OOo 3.0
This commit is contained in:
Kurt Zenker 2009-09-11 11:45:29 +00:00
parent ba079682ac
commit 374efa359a
6 changed files with 56 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
desktop/inc/deployment.hrc
View file

@ -72,7 +72,8 @@
#define RID_STR_UNOPKG_ACCEPT_LIC_Y (RID_DEPLOYMENT_UNOPKG_START+6)
#define RID_STR_UNOPKG_ACCEPT_LIC_NO (RID_DEPLOYMENT_UNOPKG_START+7)
#define RID_STR_UNOPKG_ACCEPT_LIC_N (RID_DEPLOYMENT_UNOPKG_START+8)
#define RID_STR_CONCURRENTINSTANCE (RID_DEPLOYMENT_UNOPKG_START+9)
#define RID_STR_UNOPKG_ERROR (RID_DEPLOYMENT_UNOPKG_START+9)
#define RID_STR_CONCURRENTINSTANCE (RID_DEPLOYMENT_UNOPKG_START+10)
#define RID_DEPLOYMENT_DEPENDENCIES_START (RID_DEPLOYMENT_START + 4400)
#define RID_DEPLYOMENT_DEPENDENCIES_UNKNOWN RID_DEPLOYMENT_DEPENDENCIES_START

2
desktop/source/deployment/gui/dp_gui_updatedialog.src
View file

@ -236,7 +236,7 @@ ModalDialog RID_DLG_UPDATE {
Text[en-US] = "No descriptions available for this extension.";
};
String RID_DLG_UPDATE_NOINSTALL {
Text[en-US] = "The extension cannot be installed because:";
Text[en-US] = "The extension cannot be updated because:";
};
String RID_DLG_UPDATE_NODEPENDENCY {
Text[en-US] = "Required OpenOffice.org version doesn't match:";

31
desktop/source/deployment/manager/dp_manager.cxx
View file

@ -660,10 +660,15 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage(
{
check();
if (m_readOnly)
{
OUString message;
if (m_context == OUSTR("shared"))
message = OUSTR("You need write permissions to install a shared extension!");
else
message = OUSTR("You need write permissions to install this extension!");
throw deployment::DeploymentException(
OUSTR("operating on read-only context!"),
static_cast<OWeakObject *>(this), Any() );
message, static_cast<OWeakObject *>(this), Any() );
}
Reference<XCommandEnvironment> xCmdEnv;
if (m_xLogFile.is())
xCmdEnv.set( new CmdEnvWrapperImpl( xCmdEnv_, m_xLogFile ) );
@ -893,9 +898,15 @@ void PackageManagerImpl::removePackage(
{
check();
if (m_readOnly)
{
OUString message;
if (m_context == OUSTR("shared"))
message = OUSTR("You need write permissions in order to remove a shared extension!");
else
message = OUSTR("You need write permissions in order to remove this extension!");
throw deployment::DeploymentException(
OUSTR("operating on read-only context!"),
static_cast<OWeakObject *>(this), Any() );
message, static_cast<OWeakObject *>(this), Any() );
}
Reference<XCommandEnvironment> xCmdEnv;
if (m_xLogFile.is())
@ -1117,9 +1128,15 @@ void PackageManagerImpl::reinstallDeployedPackages(
{
check();
if (m_readOnly)
{
OUString message;
if (m_context == OUSTR("shared"))
message = OUSTR("You need write permissions in order to install shared extensions!");
else
message = OUSTR("You need write permissions in order to install extensions!");
throw deployment::DeploymentException(
OUSTR("operating on read-only context!"),
static_cast<OWeakObject *>(this), Any() );
message, static_cast<OWeakObject *>(this), Any() );
}
if (office_is_running())
throw RuntimeException(

9
desktop/source/deployment/unopkg/unopkg.src
View file

@ -81,5 +81,12 @@ String RID_STR_UNOPKG_ACCEPT_LIC_N
String RID_STR_CONCURRENTINSTANCE
{
Text [ en-US ] = "You need to close the already opened Extension Manager to continue.";
Text [ en-US ] = "unopkg cannot be started. The lock file indicates it as already running. "
"If this does not apply, delete the lock file at:";
};
String RID_STR_UNOPKG_ERROR
{
Text [ en-US ] = "ERROR: ";
};

23
desktop/source/pkgchk/unopkg/unopkg_app.cxx
View file

@ -470,14 +470,23 @@ extern "C" int unopkg_main()
}
catch (deployment::DeploymentException & exc)
{
OUString cause;
if (option_verbose)
{
cause = ::comphelper::anyToString(exc.Cause);
}
else
{
css::uno::Exception e;
if (exc.Cause >>= e)
cause = e.Message;
}
dp_misc::writeConsoleError(
OUSTR("\nERROR: ") +
exc.Message + OUSTR("\n") +
OUSTR(" Cause: ") +
OUString(option_verbose ? ::comphelper::anyToString(exc.Cause):
reinterpret_cast< css::uno::Exception const *>(
exc.Cause.getValue())->Message) +
OUSTR("\n"));
OUSTR("\nERROR: ") + exc.Message + OUSTR("\n"));
if (cause.getLength())
dp_misc::writeConsoleError(
OUSTR(" Cause: ") + cause + OUSTR("\n"));
}
catch (LockFileException & e)
{

11
desktop/source/pkgchk/unopkg/unopkg_misc.cxx
View file

@ -471,10 +471,10 @@ Reference<XComponentContext> getUNO(
{
if (! s_lockfile.check( 0 ))
{
//String sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get()));
OUString sMsg(RTL_CONSTASCII_USTRINGPARAM(
"unopkg cannot be started. The lock file indicates it as already running. "
"If this does not apply, delete the lock file at:"));
String sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get()));
//Create this string before we call DeInitVCL, because this will kill
//the ResMgr
String sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get()));
sMsg = sMsg + OUSTR("\n") + getLockFilePath();
@ -497,9 +497,8 @@ Reference<XComponentContext> getUNO(
DeInitVCL();
}
// String sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get()));
throw LockFileException(
OUSTR("\n") + OUSTR("ERROR: ") + sMsg + OUSTR("\n"));
OUSTR("\n") + sError + sMsg + OUSTR("\n"));
}
}