diff options
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/Package_jreproperties.mk | 2 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 12 | ||||
| -rw-r--r-- | jvmfwk/source/fwkutil.hxx | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk index ce113ebe4dd5..cd12402c6045 100644 --- a/jvmfwk/Package_jreproperties.mk +++ b/jvmfwk/Package_jreproperties.mk @@ -9,6 +9,6 @@ $(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties))) -$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,$(LIBO_URE_LIB_FOLDER)/JREProperties.class,JREProperties.class)) +$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,$(if $(filter MACOSX,$(OS)),$(LIBO_URE_SHARE_JAVA_FOLDER),$(LIBO_URE_LIB_FOLDER))/JREProperties.class,JREProperties.class)) # vim:set noet sw=4 ts=4: diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index ccf29fc95eea..4e46a67ad0d0 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -160,7 +160,7 @@ namespace static OUString sIni; OUStringBuffer buf( 255); buf.append( getLibraryLocation()); -#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE +#ifdef MACOSX buf.appendAscii( "/../" LIBO_ETC_FOLDER ); #endif buf.appendAscii( SAL_CONFIGFILE("/sunjavaplugin") ); @@ -385,7 +385,8 @@ bool getJavaProps(const OUString & exePath, OUString usStartDir; //We need to set the CLASSPATH in case the office is started from //a different directory. The JREProperties.class is expected to reside - //next to the plugin. + //next to the plugin, except on OS X where it is in ../Resources/java relative + //to the plugin. OUString sThisLib; if (osl_getModuleURLFromAddress((void *) (sal_IntPtr)& getJavaProps, & sThisLib.pData) == sal_False) @@ -396,6 +397,13 @@ bool getJavaProps(const OUString & exePath, != osl_File_E_None) return false; +#ifdef MACOSX + if (sClassPath.endsWith("/")) + sClassPath += "../Resources/java/"; + else + sClassPath += "/../Resources/java"; +#endif + //check if we shall examine a Java for accessibility support //If the bootstrap variable is "1" then we pass the argument //"noaccessibility" to JREProperties.class. This will prevent diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx index 8bd3466c65d3..9bef1f2f6605 100644 --- a/jvmfwk/source/fwkutil.hxx +++ b/jvmfwk/source/fwkutil.hxx @@ -50,7 +50,7 @@ struct Bootstrap : const rtl::Bootstrap * operator () () { OUStringBuffer buf(256); buf.append(getLibraryLocation()); -#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE +#ifdef MACOSX // For some reason the jvmfwk3rc file is traditionally in // "ure/lib", i.e. in LIBO_URE_ETC_FOLDER buf.appendAscii( "/../" LIBO_URE_ETC_FOLDER ); |