diff options
| -rw-r--r-- | jvmfwk/inc/jvmfwk/framework.h | 9 | ||||
| -rw-r--r-- | jvmfwk/prj/build.lst | 1 | ||||
| -rw-r--r-- | jvmfwk/prj/d.lst | 4 | ||||
| -rw-r--r-- | jvmfwk/source/framework.cxx | 9 |
4 files changed, 13 insertions, 10 deletions
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h index 5f6097c317f6..bd20b541aa61 100644 --- a/jvmfwk/inc/jvmfwk/framework.h +++ b/jvmfwk/inc/jvmfwk/framework.h @@ -2,9 +2,9 @@ * * $RCSfile: framework.h,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: jl $ $Date: 2004-04-26 11:20:33 $ + * last change: $Author: jl $ $Date: 2004-05-04 08:43:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -449,8 +449,9 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo); /** provides information about the JRE that is to be used. - <p> + If no JRE is currently selected then <code>ppInfo</code> will contain + NULL on return.</br> If the value of the element <updated> in the javavendors.xml file was changed since the time when the last Java was selected then this function returns <code>JFW_E_INVALID_SETTINGS</code>. This could happen during @@ -470,8 +471,6 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo); the internally used data store. <br/> JFW_E_FORMAT_STORE the internally used data store has not the expected format<br/> - - JFW_E_NO_SELECT there is no Java selected yet.<br/> JFW_E_INVALID_SETTINGS the javavendors.xml has been changed and no JRE has been selected afterwards. <br/> */ diff --git a/jvmfwk/prj/build.lst b/jvmfwk/prj/build.lst index 93e96b3a9854..4fac3da12bda 100644 --- a/jvmfwk/prj/build.lst +++ b/jvmfwk/prj/build.lst @@ -2,3 +2,4 @@ jv jvmfwk : cppu sal libxml2 NULL jv jvmfwk\source nmake - all jv_framework NULL jv jvmfwk\plugins\sunmajor\pluginlib nmake - all jf_sunmajorlib NULL jv jvmfwk\plugins\sunmajor\javaenvsetup nmake - u jf_sunjavaldx NULL +jv jvmfwk\distributions\StarOffice nmake - all jf_staroffice NULL diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst index d20449d9c125..8ce5e67beecd 100644 --- a/jvmfwk/prj/d.lst +++ b/jvmfwk/prj/d.lst @@ -11,8 +11,8 @@ mkdir: %_DEST%\bin%_EXT%\jvmfwk_so_wnt ..\%__SRC%\bin\javaldx %_DEST%\bin%_EXT%\javaldx ..\source\useatjava.txt %_DEST%\bin%_EXT%\useatjava.txt ..\source\javasettings.xml %_DEST%\bin%_EXT%\javasettings.xml -..\distributions\StarOffice\javavendors_unx.xml %_DEST%\bin%_EXT%\jvmfwk_so_unx\javavendors.xml -..\distributions\StarOffice\javavendors_wnt.xml %_DEST%\bin%_EXT%\jvmfwk_so_wnt\javavendors.xml +..\%__SRC%\bin\javavendors_so.xml %_DEST%\bin%_EXT%\so\javavendors.xml +..\%__SRC%\bin\javavendors_ooo.xml %_DEST%\bin%_EXT%\javavendors.xml linklib: libjvmfwk*.so.*.*.* diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index b6db069bf4ba..ddaf79c68283 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -2,9 +2,9 @@ * * $RCSfile: framework.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: jl $ $Date: 2004-04-28 10:13:23 $ + * last change: $Author: jl $ $Date: 2004-05-04 08:43:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -676,7 +676,10 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo) { jfw::CJavaInfo aInfo(aSettings.getJavaInfo()); if (aInfo == NULL) - return JFW_E_NO_SELECT; + { + *ppInfo = NULL; + return JFW_E_NONE; + } //If the javavendors.xml has changed, then the current selected //Java is not valid anymore // /java/javaInfo/@vendorUpdate != javaSelection/updated (javavendors.xml) |