diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:07:40 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:07:40 +0000 |
| commit | f2a8ac8fd1a092a11c3e67809af8ecfe7cd4058f (patch) | |
| tree | 327d0a885058318de3c0cd67b3d40996d7d472f3 /jvmfwk/source/fwkutil.cxx | |
| parent | ecbe12a57770fdb5ae4eda16bd26d2f657e44730 (diff) | |
INTEGRATION: CWS sb71 (1.25.22); FILE MERGED
2007/06/15 08:16:34 sb 1.25.22.3: RESYNC: (1.25-1.26); FILE MERGED
2007/04/27 14:09:03 sb 1.25.22.2: #i75466# Removed URE_JVMFWK3RC again.
2007/04/16 13:51:37 sb 1.25.22.1: #i75466# Adapted to new URE_JVMFWK3RC; support vnd.sun.star.expand URLs in javavendors.xml.
Diffstat (limited to 'jvmfwk/source/fwkutil.cxx')
| -rw-r--r-- | jvmfwk/source/fwkutil.cxx | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx index 00bb2ffd33c0..4a50d64b5a70 100644 --- a/jvmfwk/source/fwkutil.cxx +++ b/jvmfwk/source/fwkutil.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fwkutil.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: obo $ $Date: 2007-06-13 07:58:23 $ + * last change: $Author: vg $ $Date: 2007-10-15 12:07:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,6 +58,8 @@ #include "rtl/instance.hxx" #include "rtl/uri.hxx" #include "osl/getglobalmutex.hxx" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "cppuhelper/bootstrap.hxx" #include "framework.hxx" #include "fwkutil.hxx" @@ -228,10 +230,25 @@ rtl::OUString getExecutableDirectory() rtl::OUString findPlugin( const rtl::OUString & baseUrl, const rtl::OUString & plugin) { + rtl::OUString expandedPlugin; + try + { + expandedPlugin = cppu::bootstrap_expandUri(plugin); + } + catch (com::sun::star::lang::IllegalArgumentException & e) + { + throw FrameworkException( + JFW_E_ERROR, + (rtl::OString( + RTL_CONSTASCII_STRINGPARAM( + "[Java framework] IllegalArgumentException in" + " findPlugin: ")) + + rtl::OUStringToOString(e.Message, osl_getThreadTextEncoding()))); + } rtl::OUString sUrl; try { - sUrl = rtl::Uri::convertRelToAbs(baseUrl, plugin); + sUrl = rtl::Uri::convertRelToAbs(baseUrl, expandedPlugin); } catch (rtl::MalformedUriException & e) { |