diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-05 10:07:18 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-05 10:07:18 +0100 |
| commit | 7afc24c9072e295730aae5a5959e4b5bf2972a1e (patch) | |
| tree | f222abc2cd9b19978e1a446e1cd6429d0bd39e7d /stoc/source/simpleregistry/textualservices.cxx | |
| parent | e08c34ff87f2b676acc265fc0f23a5ee7ebeeee3 (diff) | |
| parent | 77ffc6a41ba05725442df132131597fca78a84ea (diff) | |
dba34b: merged DEV300m96
Diffstat (limited to 'stoc/source/simpleregistry/textualservices.cxx')
| -rw-r--r--[-rwxr-xr-x] | stoc/source/simpleregistry/textualservices.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/stoc/source/simpleregistry/textualservices.cxx b/stoc/source/simpleregistry/textualservices.cxx index 932c639124d0..5a50a5aa62c6 100755..100644 --- a/stoc/source/simpleregistry/textualservices.cxx +++ b/stoc/source/simpleregistry/textualservices.cxx @@ -41,8 +41,10 @@ #include "com/sun/star/uno/XInterface.hpp" #include "cppuhelper/implbase1.hxx" #include "osl/diagnose.h" +#include "rtl/malformeduriexception.hxx" #include "rtl/ref.hxx" #include "rtl/string.h" +#include "rtl/uri.hxx" #include "rtl/ustrbuf.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" @@ -306,6 +308,16 @@ void Parser::handleComponent() { ": <component> is missing \"loader\" attribute"))), css::uno::Reference< css::uno::XInterface >()); } + try { + attrUri_ = rtl::Uri::convertRelToAbs(reader_.getUrl(), attrUri_); + } catch (rtl::MalformedUriException & e) { + throw css::registry::InvalidRegistryException( + (reader_.getUrl() + + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM(": bad \"uri\" attribute: ")) + + e.getMessage()), + css::uno::Reference< css::uno::XInterface >()); + } } void Parser::handleImplementation() { |