[Libreoffice-commits] core.git: jvmfwk/plugins

[Markus Mohrhard]

 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx |   22 ----------------------
 1 file changed, 22 deletions(-)

New commits:
commit 4badcfda55996891d99b1f0a8cc47028acd1c0c1
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Oct 14 06:10:15 2013 +0200

    Revert "Related: #i119525# List only JREs whose jvm library can be loaded"
    
    This reverts commit 37ca14359b8c4027f1d9f9569ddfa2740cd2731e.
    
    This breaks the loading of the jvm.dll on Windows if the msvcr*.dll is
    not in the system path.

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index b1cd722..6fa931d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -19,9 +19,6 @@
 
 
 #include "osl/file.hxx"
-#include "osl/diagnose.h"
-#include "osl/module.hxx"
-#include "osl/thread.hxx"
 
 #include "vendorbase.hxx"
 #include "util.hxx"
@@ -161,25 +158,6 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
     if (!bRt)
         return false;
 
-#if defined(WNT)
-    oslModule moduleRt = 0;
-    rtl::OUString sRuntimeLib;
-    if( File::getSystemPathFromFileURL( m_sRuntimeLibrary, sRuntimeLib ) == File::E_None )
-    {
-        if ( ( moduleRt = osl_loadModule( sRuntimeLib.pData, SAL_LOADMODULE_DEFAULT ) ) == 0 )
-        {
-            OSL_TRACE( "jfw_plugin::VendorBase::initialize - cannot load library %s",
-                       rtl::OUStringToOString( sRuntimeLib, osl_getThreadTextEncoding() ).getStr() );
-            return false;
-        }
-        else
-        {
-            // do not leave the module loaded!
-            osl_unloadModule( moduleRt );
-        }
-    }
-#endif
-
     // init m_sLD_LIBRARY_PATH
     OSL_ASSERT(!m_sHome.isEmpty());
     size = 0;