mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS uno3 (1.53.6); FILE MERGED

Browse Source 
2003/04/22 14:26:40 jl 1.53.6.1: #108692# correct error message if office is not configured to run java
This commit is contained in:
Vladimir Glazounov
2003-04-24 13:10:05 +00:00
parent b263866f00
commit c9e108aac6
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
stoc/source/javavm/javavm.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: javavm.cxx,v $ * $RCSfile: javavm.cxx,v $
* *
* $Revision: 1.55 $ * $Revision: 1.56 $
* *
* last change: $Author: rt $ $Date: 2003-04-23 16:12:59 $ * last change: $Author: vg $ $Date: 2003-04-24 14:10:05 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -840,9 +840,8 @@ void initVMConfiguration(stoc_javavm::JVM * pjvm,
#endif #endif
} }
sal_Bool bPropsFail = sal_False;
sal_Bool bPropsFail2= sal_False; sal_Bool bPropsFail= sal_False;
css::java::JavaNotConfiguredException confexc;
try try
{ {
//JavaNotConfiguredException is rethrown. The user chose not to use java, therefore //JavaNotConfiguredException is rethrown. The user chose not to use java, therefore
@@ -858,6 +857,10 @@ void initVMConfiguration(stoc_javavm::JVM * pjvm,
{ {
throw; throw;
} }
catch(css::java::JavaNotConfiguredException& e)
{
throw;
}
catch(css::uno::Exception & exception) catch(css::uno::Exception & exception)
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
@@ -880,15 +883,7 @@ void initVMConfiguration(stoc_javavm::JVM * pjvm,
"and there are no environment variables set which " \ "and there are no environment variables set which " \
"contain configuration data")), 0); "contain configuration data")), 0);
} }
<<<<<<< javavm.cxx
=======
>>>>>>> 1.52.2.1.16.2
} }
<<<<<<< javavm.cxx
=======
>>>>>>> 1.52.2.1.16.2
try { try {
getJavaPropsFromSafetySettings(&jvm, xSMgr, xCtx); getJavaPropsFromSafetySettings(&jvm, xSMgr, xCtx);
} }