summaryrefslogtreecommitdiff
path: root/jvmfwk/source/fwkutil.cxx
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2004-05-18 08:03:37 +0000
committerJoachim Lingner <jl@openoffice.org>2004-05-18 08:03:37 +0000
commitb2197626fde63249f99e14e049423b87560b5f9a (patch)
treec970d2a80cf967768154883b9c86d233baf34c08 /jvmfwk/source/fwkutil.cxx
parentf0df8160e185acda43a2edc04ec915868fce29a6 (diff)
#i20052#
Diffstat (limited to 'jvmfwk/source/fwkutil.cxx')
-rw-r--r--jvmfwk/source/fwkutil.cxx17
1 files changed, 15 insertions, 2 deletions
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 5fe8c7290579..c4eb8fa515e2 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fwkutil.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: jl $ $Date: 2004-05-18 08:37:33 $
+ * last change: $Author: jl $ $Date: 2004-05-18 09:03:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -439,6 +439,19 @@ rtl::OUString getVendorSettingsURL()
if (fileError == osl::FileBase::E_None)
return sVendor;
+ //Hack. try the so sub dir of the executable dir. Necessery for build process
+ //where javavendors.xml is delivered to ../bin/so for StarOffice
+ sVendor = getDirFromFile(ouExe);
+ sBufVendor.append(sVendor);
+ sBufVendor.appendAscii("/so/");
+ sBufVendor.appendAscii(VENDORSETTINGS);
+ sVendor = sBufVendor.makeStringAndClear();
+ //check if the file exists
+ fileError = osl::DirectoryItem::get(sVendor, vendorItem);
+ if (fileError == osl::FileBase::E_None)
+ return sVendor;
+
+
//try next to the jvmfwk.dll
rtl::OUString sLib;
if (osl_getModuleURLFromAddress((void *) & getVendorSettingsURL,