diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-10 15:52:22 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-08-13 18:05:02 +0200 |
| commit | de63d48f9b8be0f5099f054e0978f3e0d3750864 (patch) | |
| tree | ccfc60445291e0d2a12295047cbce74e1bc5e089 /jvmfwk/source/framework.cxx | |
| parent | cbb047527d856258b7b925dc37f56f0e9b0b3e90 (diff) | |
Related fdo#51252: No more prereg, no more unopkg sync
Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
share/prereg/bundled to avoid startup crashes" removed the use of share/prereg,
there is no longer need to generate it in the first place (by calling "unopkg
sync" at build or installation time), and so no need for the "unopkg sync" sub-
command, either. This also allows to simplify some of the jvmfwk code that was
only there so that "unopkg sync" (which can require a JVM) can work in "hostile"
environments (during build and installation).
Conflicts:
setup_native/prj/d.lst
Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f
Signed-off-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'jvmfwk/source/framework.cxx')
| -rw-r--r-- | jvmfwk/source/framework.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 0099cc8c285c..b7890b910139 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -610,7 +610,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) } if ((JavaInfo*) aCurrentInfo) { - jfw::NodeJava javaNode; + jfw::NodeJava javaNode(jfw::NodeJava::USER); javaNode.setJavaInfo(aCurrentInfo,true); javaNode.write(); @@ -871,7 +871,7 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo) if (jfw_areEqualJavaInfo(currentInfo, pInfo) == sal_False) { - jfw::NodeJava node; + jfw::NodeJava node(jfw::NodeJava::USER); node.setJavaInfo(pInfo, false); node.write(); //remember that the JRE was selected in this process @@ -907,7 +907,7 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled) if (settings.getEnabled() == sal_False) g_bEnabledSwitchedOn = true; } - jfw::NodeJava node; + jfw::NodeJava node(jfw::NodeJava::USER); node.setEnabled(bEnabled); node.write(); } @@ -952,7 +952,7 @@ javaFrameworkError SAL_CALL jfw_setVMParameters( osl::MutexGuard guard(jfw::FwkMutex::get()); if (jfw::getMode() == jfw::JFW_MODE_DIRECT) return JFW_E_DIRECT_MODE; - jfw::NodeJava node; + jfw::NodeJava node(jfw::NodeJava::USER); if (arOptions == NULL && nLen != 0) return JFW_E_INVALID_ARG; node.setVmParameters(arOptions, nLen); @@ -1000,7 +1000,7 @@ javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCp) osl::MutexGuard guard(jfw::FwkMutex::get()); if (jfw::getMode() == jfw::JFW_MODE_DIRECT) return JFW_E_DIRECT_MODE; - jfw::NodeJava node; + jfw::NodeJava node(jfw::NodeJava::USER); if (pCp == NULL) return JFW_E_INVALID_ARG; node.setUserClassPath(pCp); @@ -1046,7 +1046,7 @@ javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation) osl::MutexGuard guard(jfw::FwkMutex::get()); if (jfw::getMode() == jfw::JFW_MODE_DIRECT) return JFW_E_DIRECT_MODE; - jfw::NodeJava node; + jfw::NodeJava node(jfw::NodeJava::USER); if (sLocation == NULL) return JFW_E_INVALID_ARG; node.load(); @@ -1073,7 +1073,7 @@ javaFrameworkError SAL_CALL jfw_setJRELocations( osl::MutexGuard guard(jfw::FwkMutex::get()); if (jfw::getMode() == jfw::JFW_MODE_DIRECT) return JFW_E_DIRECT_MODE; - jfw::NodeJava node; + jfw::NodeJava node(jfw::NodeJava::USER); if (arLocations == NULL && nLen != 0) return JFW_E_INVALID_ARG; node.setJRELocations(arLocations, nLen); |