diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-16 11:08:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | c6a73009747814513ab5a7277c211449c7378870 (patch) | |
| tree | 2adc961b3c83deffcea251c41744f2626e476f38 /jvmfwk | |
| parent | 18041138d3169d565755565bdbabd8de596b5ac7 (diff) | |
Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.
Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 5 | ||||
| -rw-r--r-- | jvmfwk/source/fwkutil.hxx | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index d1c26205d690..0e323cfb9f96 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> +#include <config_folders.h> #include "util.hxx" @@ -154,6 +156,9 @@ namespace static OUString sIni; OUStringBuffer buf( 255); buf.append( getLibraryLocation()); +#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE + buf.appendAscii( "/../" LIBO_ETC_FOLDER ); +#endif buf.appendAscii( SAL_CONFIGFILE("/sunjavaplugin") ); sIni = buf.makeStringAndClear(); JFW_TRACE2("[Java framework] sunjavaplugin: " diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx index 0411869f8b72..4c9ac047d130 100644 --- a/jvmfwk/source/fwkutil.hxx +++ b/jvmfwk/source/fwkutil.hxx @@ -19,6 +19,9 @@ #ifndef INCLUDED_JVMFWK_FWKUTIL_HXX #define INCLUDED_JVMFWK_FWKUTIL_HXX +#include <config_features.h> +#include <config_folders.h> + #include "sal/config.h" #include "osl/mutex.hxx" #include "rtl/bootstrap.hxx" @@ -47,6 +50,9 @@ struct Bootstrap : const rtl::Bootstrap * operator () () { OUStringBuffer buf(256); buf.append(getLibraryLocation()); +#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE + buf.appendAscii( "/../" LIBO_ETC_FOLDER ); +#endif buf.appendAscii(SAL_CONFIGFILE("/jvmfwk3")); OUString sIni = buf.makeStringAndClear(); ::rtl::Bootstrap * bootstrap = new ::rtl::Bootstrap(sIni); |