diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-10 15:52:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-10 16:03:28 +0200 |
| commit | 6dcb3d4ef46312729bb6f16c473b433474863f68 (patch) | |
| tree | 58f2f577d9883e32b886bbe4086f83d0bb16fc81 /jvmfwk/source/framework.cxx | |
| parent | f2f3703740f65b76e891ecc3591d7e60d5b7caef (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).
Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f
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 066645029136..28276b8bda5d 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -601,7 +601,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(); @@ -862,7 +862,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 @@ -898,7 +898,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(); } @@ -943,7 +943,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); @@ -991,7 +991,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); @@ -1037,7 +1037,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(); @@ -1064,7 +1064,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); |