resync to trunk (close to AOO400)

5 files changed, 19 insertions, 13 deletions

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 149387611e54..63eb024a9a5e 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -23,18 +23,22 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- <updated>2006-05-02</updated>
+ <updated>2013-01-01</updated>
 
  <vendorInfos>
   <vendor name="Apple Computer, Inc.">
     <minVersion>1.5.0</minVersion>
   </vendor>
  <vendor name="Apple Inc.">
-  <minVersion>1.5.0</minVersion>
+    <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="Oracle Corporation">
+    <minVersion>1.7.0</minVersion>
  </vendor>
  </vendorInfos>
  <plugins>
   <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
   <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
  </plugins>
 </javaSelection>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 41198d00c36c..98860a98caa6 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -267,7 +267,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
             }
         }
 
-        if (arExcludeList > 0)
+        if( arExcludeList != NULL)
         {
             bool bExclude = false;
             for (int j = 0; j < nLenList; j++)
@@ -397,7 +397,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
             return JFW_PLUGIN_E_FAILED_VERSION;
     }
 
-    if (arExcludeList > 0)
+    if( arExcludeList != NULL)
     {
         for (int i = 0; i < nLenList; i++)
         {
@@ -498,7 +498,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
             sRuntimeLib, osl_getThreadTextEncoding());
         rtl::OString sSymbol = rtl::OUStringToOString(
             sSymbolCreateJava, osl_getThreadTextEncoding());
-        fprintf(stderr,"[Java framework]sunjavaplugin"SAL_DLLEXTENSION
+        fprintf(stderr,"[Java framework]sunjavaplugin" SAL_DLLEXTENSION
                 "Java runtime library: %s does not export symbol %s !\n",
                 sLib.getStr(), sSymbol.getStr());
         return JFW_PLUGIN_E_VM_CREATION_FAILED;
@@ -589,13 +589,13 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
         rtl::OUString message;
         if( err < 0)
         {
-            fprintf(stderr,"[Java framework] sunjavaplugin"SAL_DLLEXTENSION
+            fprintf( stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION
                     "Can not create Java Virtual Machine\n");
             errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
         }
         else if( err > 0)
         {
-            fprintf(stderr,"[Java framework] sunjavaplugin"SAL_DLLEXTENSION
+            fprintf( stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION
                     "Can not create JavaVirtualMachine, abort handler was called.\n");
             errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
         }
@@ -603,7 +603,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     else
     {
         *ppVm = pJavaVM;
-        JFW_TRACE2("[Java framework] sunjavaplugin"SAL_DLLEXTENSION " has created a VM.\n");
+        JFW_TRACE2( "[Java framework] sunjavaplugin" SAL_DLLEXTENSION " has created a VM.\n");
     }
 
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 925520da5cdd..cf816fd1bed4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -69,13 +69,14 @@ char const* const* SunInfo::getRuntimePaths(int * size)
         "/bin/classic/jvm.dll",
         "/bin/client/jvm.dll",
         // TODO add jrockit here
-#elif UNX
+#elif defined(MACOSX)
+        "/lib/server/libjvm.dylib"
+#elif defined(UNX)
         "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
 #endif
-
     };
     *size = sizeof(ar) / sizeof (char*);
     return ar;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 41c581637d7f..57c19ee78fc5 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -97,6 +97,7 @@ char const *g_arCollectDirs[] = {
 char const *g_arSearchPaths[] = {
 #ifdef MACOSX
     "",
+    "Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin",
     "System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/"
 #else
     "",
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 1b08b047013a..675b52d7579a 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -101,7 +101,7 @@ rtl::OString getElementModified()
 }
 
 
-void createSettingsStructure(xmlDoc * document, bool * bNeedsSave)
+void createSettingsStructure( xmlDoc* document, bool* pbNeedsSave)
 {
     rtl::OString sExcMsg("[Java framework] Error in function createSettingsStructure "
                          "(elements.cxx).");
@@ -121,11 +121,11 @@ void createSettingsStructure(xmlDoc * document, bool * bNeedsSave)
     }
     if (bFound)
     {
-        bNeedsSave = false;
+        *pbNeedsSave = false;
         return;
     }
     //We will modify this document
-    *bNeedsSave = true;
+    *pbNeedsSave = true;
     // Now we create the child elements ------------------
     //Get xsi:nil namespace
     xmlNs* nsXsi = xmlSearchNsByHref(