diff options
author | David Tardon <dtardon@redhat.com> | 2012-04-01 11:55:47 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-04-01 12:21:00 +0200 |
commit | 59c0f8f452a538308a9d4098cdc8319b884c3c81 (patch) | |
tree | 6272bb19d30661acdc9995f8a18ce11e9f2fe6b0 /stoc/source/simpleregistry | |
parent | b3b76d1abb5ab9af33ce559872c2e1c45ecdbbd0 (diff) | |
parent | 464a3a271cd4b97573e87d15a38b3f4cad727daf (diff) |
merge origin/master
Diffstat (limited to 'stoc/source/simpleregistry')
-rw-r--r-- | stoc/source/simpleregistry/textualservices.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/stoc/source/simpleregistry/textualservices.cxx b/stoc/source/simpleregistry/textualservices.cxx index 37540c820134..ad24a4454550 100644 --- a/stoc/source/simpleregistry/textualservices.cxx +++ b/stoc/source/simpleregistry/textualservices.cxx @@ -326,6 +326,7 @@ void Parser::handleComponent() { ": <component> is missing \"loader\" attribute"))), css::uno::Reference< css::uno::XInterface >()); } +#ifndef DISABLE_DYNLOADING try { attrUri_ = rtl::Uri::convertRelToAbs(reader_.getUrl(), attrUri_); } catch (const rtl::MalformedUriException & e) { @@ -336,6 +337,7 @@ void Parser::handleComponent() { e.getMessage()), css::uno::Reference< css::uno::XInterface >()); } +#endif } void Parser::handleImplementation() { |