jvmfwk/source/framework.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit c56600dfbeaf687f249e4fb641044595892b4ebc Author: Tor Lillqvist <[email protected]> Date: Sun Oct 7 10:33:46 2012 +0300 Move the #ifndef DISABLE_DYNLOADING a bit earlier Change-Id: I1777d6304b2ebb218c0f85c778f1a66d05c4f454 diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 2f1760a..4694bf6 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -387,11 +387,11 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti jfw::VendorSettings aVendorSettings; rtl::OUString sLibPath = aVendorSettings.getPluginLibrary(aInfo.getVendor()); +#ifndef DISABLE_DYNLOADING osl::Module modulePlugin(sLibPath); if ( ! modulePlugin) return JFW_E_NO_PLUGIN; -#ifndef DISABLE_DYNLOADING rtl::OUString sFunctionName( RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_startJavaVirtualMachine")); jfw_plugin_startJavaVirtualMachine_ptr pFunc = _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
