[Libreoffice-commits] core.git: 3 commits - bridges/Library_cpp_uno.mk jvmfwk/distributions jvmfwk/plugins vcl/coretext

[Tor Lillqvist]

 bridges/Library_cpp_uno.mk                                |    3 ++-
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml |    6 +++++-
 jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx              |   11 ++++++++++-
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx                |   10 ++++++++++
 vcl/coretext/salcoretextlayout.cxx                        |    1 +
 5 files changed, 28 insertions(+), 3 deletions(-)

New commits:
commit 1155f024840ea7cffdacb3c9a09f3d88f8d095ff
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Apr 9 00:39:41 2013 +0300

    The OS X x86_64 callvirtualmethod.cxx doesn't work if optimized
    
    Change-Id: Ib7a5cfa3f547364ba04e09d4829b7f3a477c731f

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index d0fe43e..7ce51f5 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -135,7 +135,8 @@ bridge_noopt_objects := callvirtualmethod
 bridge_exception_objects := abi cpp2uno except uno2cpp
 else ifeq ($(OS),MACOSX)
 bridges_SELECTED_BRIDGE := gcc3_macosx_x86-64
-bridge_exception_objects := abi call callvirtualmethod cpp2uno except uno2cpp
+bridge_exception_objects := abi call cpp2uno except uno2cpp
+bridge_noopt_objects := callvirtualmethod
 else ifeq ($(COM),MSC)
 bridges_SELECTED_BRIDGE := msvc_win32_x86-64
 bridge_exception_objects := cpp2uno dllinit uno2cpp
commit 02864717973c01b055152795ac747aeb9c160169
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Apr 9 00:37:27 2013 +0300

    Look for Oracle Java 7 in a 64-bit LibreOffice on OS X
    
    Change-Id: Ife3fc97c11ab5216df62aba92dc11ed6cf07c154

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 673ebbf..172b570 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -20,7 +20,7 @@
 <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-04-09</updated>
 
  <vendorInfos>
   <vendor name="Apple Computer, Inc.">
@@ -29,8 +29,12 @@
  <vendor name="Apple Inc.">
   <minVersion>1.5.0</minVersion>
  </vendor>
+ <vendor name="Oracle Corporation">
+  <minVersion>1.7.0</minVersion>
+ </vendor>
  </vendorInfos>
  <plugins>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library>
   <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library>
   <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library>
  </plugins>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index fb77e2a..f82a286 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -59,6 +59,9 @@ char const* const* SunInfo::getRuntimePaths(int * size)
         "/bin/classic/jvm.dll",
         // The 64-bit JRE has the jvm in bin/server
         "/bin/server/jvm.dll"
+#elif defined MACOSX && defined X86_64
+        // Oracle Java 7, under /Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home
+        "/lib/server/libjvm.dylib"
 #elif defined UNX
         "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
@@ -71,12 +74,18 @@ char const* const* SunInfo::getRuntimePaths(int * size)
 
 char const* const* SunInfo::getLibraryPaths(int* size)
 {
-#ifdef UNX
+#if defined UNX
     static char const * ar[] = {
+#if defined MACOSX && defined X86_64
+        // Oracle Java 7, under /Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home
+        "/lib/server",
+        "/lib"
+#else
         "/lib/" JFW_PLUGIN_ARCH "/client",
         "/lib/" JFW_PLUGIN_ARCH "/server",
         "/lib/" JFW_PLUGIN_ARCH "/native_threads",
         "/lib/" JFW_PLUGIN_ARCH
+#endif
     };
     *size = SAL_N_ELEMENTS(ar);
     return ar;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index fea25b0..f488b15 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -61,6 +61,7 @@ using ::rtl::Reference;
 #endif
 
 #ifdef UNX
+#if !(defined MACOSX && defined X86_64)
 namespace {
 char const *g_arJavaNames[] = {
     "",
@@ -113,6 +114,7 @@ char const *g_arSearchPaths[] = {
 #endif
 };
 }
+#endif
 #endif //  UNX
 
 namespace jfw_plugin
@@ -1137,6 +1139,14 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
     getJREInfoByPath("file:////usr/jdk/latest", vecInfos);
 }
 
+#elif defined MACOSX && defined X86_64
+
+void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
+{
+    // Oracle Java 7
+    getJREInfoByPath("file:///Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home", vecInfos);
+}
+
 #else
 void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
 {
commit 2ecae4cd94445371cdee7defaac784707a9642da
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Apr 8 23:44:41 2013 +0300

    WaE: unused variable 'lineRunGlyphStartIx'
    
    Change-Id: I444673fc46699512be0830fba94f752a5ccf619c

diff --git a/vcl/coretext/salcoretextlayout.cxx b/vcl/coretext/salcoretextlayout.cxx
index 6832bdb..ddd6928 100644
--- a/vcl/coretext/salcoretextlayout.cxx
+++ b/vcl/coretext/salcoretextlayout.cxx
@@ -591,6 +591,7 @@ void CoreTextLayout::GetMeasurements()
             assert( lineGlyphIx + runGlyphCount <= mnGlyphCount );
 
             const CFIndex lineRunGlyphStartIx = lineGlyphIx;
+            (void) lineRunGlyphStartIx;
 
             CFIndex runStringIndices[ runGlyphCount ];
             CTRunGetStringIndices( run, CFRangeMake( 0, 0 ), runStringIndices );