diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
commit | a82eae375ecc76c25bb2172424d22bfe479e28d1 (patch) | |
tree | 99fcf65104c29bd4ef436653b4a361f46789b4e7 /stoc/source/simpleregistry/textualservices.cxx | |
parent | a64d0f306856ede0265937969ab5ae0754076ac4 (diff) | |
parent | 08a08dec6e62da86b8e1746bb205cb32ee4c7f98 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
xmlreader/prj/d.lst
Diffstat (limited to 'stoc/source/simpleregistry/textualservices.cxx')
-rw-r--r-- | stoc/source/simpleregistry/textualservices.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/stoc/source/simpleregistry/textualservices.cxx b/stoc/source/simpleregistry/textualservices.cxx index 5a50a5aa62c6..483c8ba5bc4e 100644 --- a/stoc/source/simpleregistry/textualservices.cxx +++ b/stoc/source/simpleregistry/textualservices.cxx @@ -283,13 +283,7 @@ void Parser::handleComponent() { css::uno::Reference< css::uno::XInterface >()); } } else { - throw css::registry::InvalidRegistryException( - (reader_.getUrl() + - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - ": expected <component> attribute \"uri\" or" - " \"loader\""))), - css::uno::Reference< css::uno::XInterface >()); + OSL_FAIL ("unexpected component attribute, expected 'uri' or 'loader'"); } } if (attrUri_.getLength() == 0) { |