summaryrefslogtreecommitdiff
path: root/stoc/source/uriproc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /stoc/source/uriproc
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'stoc/source/uriproc')
-rw-r--r--stoc/source/uriproc/ExternalUriReferenceTranslator.cxx20
-rw-r--r--stoc/source/uriproc/UriReferenceFactory.cxx54
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx50
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx66
-rw-r--r--stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx16
5 files changed, 103 insertions, 103 deletions
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index f314d158ec9f..0b6300fe394f 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -51,21 +51,21 @@ public:
m_context(context) {}
virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException);
+ getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception);
virtual OUString SAL_CALL
translateToInternal(OUString const & externalUriReference)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual OUString SAL_CALL
translateToExternal(OUString const & internalUriReference)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
private:
Translator(Translator &); // not implemented
@@ -77,20 +77,20 @@ private:
};
OUString Translator::getImplementationName()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return
stoc_services::ExternalUriReferenceTranslator::getImplementationName();
}
sal_Bool Translator::supportsService(OUString const & serviceName)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, serviceName);
}
css::uno::Sequence< OUString > Translator::getSupportedServiceNames()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return stoc_services::ExternalUriReferenceTranslator::
getSupportedServiceNames();
@@ -98,7 +98,7 @@ css::uno::Sequence< OUString > Translator::getSupportedServiceNames()
OUString Translator::translateToInternal(
OUString const & externalUriReference)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
if (!externalUriReference.matchIgnoreAsciiCase("file:/"))
{
@@ -147,7 +147,7 @@ OUString Translator::translateToInternal(
OUString Translator::translateToExternal(
OUString const & internalUriReference)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
if (!internalUriReference.matchIgnoreAsciiCase("file://"))
{
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index a6edbc135551..0971fb8a7a46 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -105,71 +105,71 @@ public:
{}
virtual OUString SAL_CALL getUriReference()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getUriReference(); }
virtual sal_Bool SAL_CALL isAbsolute()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.isAbsolute(); }
virtual OUString SAL_CALL getScheme()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getScheme(); }
virtual OUString SAL_CALL getSchemeSpecificPart()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getSchemeSpecificPart(); }
virtual sal_Bool SAL_CALL isHierarchical()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.isHierarchical(); }
virtual sal_Bool SAL_CALL hasAuthority()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.hasAuthority(); }
virtual OUString SAL_CALL getAuthority()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getAuthority(); }
virtual OUString SAL_CALL getPath()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getPath(); }
virtual sal_Bool SAL_CALL hasRelativePath()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.hasRelativePath(); }
virtual sal_Int32 SAL_CALL getPathSegmentCount()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getPathSegmentCount(); }
virtual OUString SAL_CALL getPathSegment(sal_Int32 index)
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getPathSegment(index); }
virtual sal_Bool SAL_CALL hasQuery()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.hasQuery(); }
virtual OUString SAL_CALL getQuery()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getQuery(); }
virtual sal_Bool SAL_CALL hasFragment()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.hasFragment(); }
virtual OUString SAL_CALL getFragment()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getFragment(); }
virtual void SAL_CALL setFragment(OUString const & fragment)
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ m_base.setFragment(fragment); }
virtual void SAL_CALL clearFragment()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ m_base.clearFragment(); }
private:
@@ -266,13 +266,13 @@ public:
m_context(context) {}
virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException);
+ getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
parse(OUString const & uriReference)
@@ -284,7 +284,7 @@ public:
css::uno::Reference< css::uri::XUriReference > const & uriReference,
sal_Bool processSpecialBaseSegments,
css::uri::RelativeUriExcessParentSegments excessParentSegments)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
makeRelative(
@@ -293,7 +293,7 @@ public:
sal_Bool preferAuthorityOverRelativePath,
sal_Bool preferAbsoluteOverRelativePath,
sal_Bool encodeRetainedSpecialSegments)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
private:
Factory(Factory &); // not implemented
@@ -309,19 +309,19 @@ private:
};
OUString Factory::getImplementationName()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return stoc_services::UriReferenceFactory::getImplementationName();
}
sal_Bool Factory::supportsService(OUString const & serviceName)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, serviceName);
}
css::uno::Sequence< OUString > Factory::getSupportedServiceNames()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return stoc_services::UriReferenceFactory::getSupportedServiceNames();
}
@@ -401,7 +401,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute(
css::uno::Reference< css::uri::XUriReference > const & uriReference,
sal_Bool processSpecialBaseSegments,
css::uri::RelativeUriExcessParentSegments excessParentSegments)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
if (!baseUriReference.is() || !baseUriReference->isAbsolute()
|| !baseUriReference->isHierarchical() || !uriReference.is()) {
@@ -517,7 +517,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative(
sal_Bool preferAuthorityOverRelativePath,
sal_Bool preferAbsoluteOverRelativePath,
sal_Bool encodeRetainedSpecialSegments)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
if (!baseUriReference.is() || !baseUriReference->isAbsolute()
|| !baseUriReference->isHierarchical() || !uriReference.is()) {
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index ad4008dd9eb7..e6e3a9780fbd 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -66,72 +66,72 @@ public:
{}
virtual OUString SAL_CALL getUriReference()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ return base_.getUriReference(); }
- virtual ::sal_Bool SAL_CALL isAbsolute() throw (css::uno::RuntimeException)
+ virtual ::sal_Bool SAL_CALL isAbsolute() throw (css::uno::RuntimeException, std::exception)
{ return base_.isAbsolute(); }
virtual OUString SAL_CALL getScheme()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ return base_.getScheme(); }
virtual OUString SAL_CALL getSchemeSpecificPart()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ return base_.getSchemeSpecificPart(); }
virtual ::sal_Bool SAL_CALL isHierarchical()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ return base_.isHierarchical(); }
virtual ::sal_Bool SAL_CALL hasAuthority()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ return base_.hasAuthority(); }
virtual OUString SAL_CALL getAuthority()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ return base_.getAuthority(); }
virtual OUString SAL_CALL getPath()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ return base_.getPath(); }
virtual ::sal_Bool SAL_CALL hasRelativePath()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ return base_.hasRelativePath(); }
virtual ::sal_Int32 SAL_CALL getPathSegmentCount()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ return base_.getPathSegmentCount(); }
virtual OUString SAL_CALL getPathSegment(sal_Int32 index)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ return base_.getPathSegment(index); }
- virtual ::sal_Bool SAL_CALL hasQuery() throw (css::uno::RuntimeException)
+ virtual ::sal_Bool SAL_CALL hasQuery() throw (css::uno::RuntimeException, std::exception)
{ return base_.hasQuery(); }
virtual OUString SAL_CALL getQuery()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ return base_.getQuery(); }
- virtual ::sal_Bool SAL_CALL hasFragment() throw (css::uno::RuntimeException)
+ virtual ::sal_Bool SAL_CALL hasFragment() throw (css::uno::RuntimeException, std::exception)
{ return base_.hasFragment(); }
virtual OUString SAL_CALL getFragment()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ return base_.getFragment(); }
virtual void SAL_CALL setFragment(OUString const & fragment)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{ base_.setFragment(fragment); }
- virtual void SAL_CALL clearFragment() throw (css::uno::RuntimeException)
+ virtual void SAL_CALL clearFragment() throw (css::uno::RuntimeException, std::exception)
{ base_.clearFragment(); }
virtual OUString SAL_CALL expand(
css::uno::Reference< css::util::XMacroExpander > const & expander)
- throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
private:
UrlReference(UrlReference &); // not defined
@@ -144,7 +144,7 @@ private:
OUString UrlReference::expand(
css::uno::Reference< css::util::XMacroExpander > const & expander)
- throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
OSL_ASSERT(expander.is());
return expander->expandMacros(
@@ -159,14 +159,14 @@ public:
Parser() {}
virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual ::sal_Bool SAL_CALL supportsService(
OUString const & serviceName)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException);
+ getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
parse(
@@ -182,20 +182,20 @@ private:
};
OUString Parser::getImplementationName()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return ::stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTexpand::
getImplementationName();
}
::sal_Bool Parser::supportsService(OUString const & serviceName)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, serviceName);
}
css::uno::Sequence< OUString > Parser::getSupportedServiceNames()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return ::stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTexpand::
getSupportedServiceNames();
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 53c15bff3d6f..9faace973ed9 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -199,86 +199,86 @@ public:
{}
virtual OUString SAL_CALL getUriReference()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getUriReference(); }
virtual sal_Bool SAL_CALL isAbsolute()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.isAbsolute(); }
virtual OUString SAL_CALL getScheme()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getScheme(); }
virtual OUString SAL_CALL getSchemeSpecificPart()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getSchemeSpecificPart(); }
virtual sal_Bool SAL_CALL isHierarchical()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.isHierarchical(); }
virtual sal_Bool SAL_CALL hasAuthority()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.hasAuthority(); }
virtual OUString SAL_CALL getAuthority()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getAuthority(); }
virtual OUString SAL_CALL getPath()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getPath(); }
virtual sal_Bool SAL_CALL hasRelativePath()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.hasRelativePath(); }
virtual sal_Int32 SAL_CALL getPathSegmentCount()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getPathSegmentCount(); }
virtual OUString SAL_CALL getPathSegment(sal_Int32 index)
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getPathSegment(index); }
virtual sal_Bool SAL_CALL hasQuery()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.hasQuery(); }
virtual OUString SAL_CALL getQuery()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getQuery(); }
virtual sal_Bool SAL_CALL hasFragment()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.hasFragment(); }
virtual OUString SAL_CALL getFragment()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ return m_base.getFragment(); }
virtual void SAL_CALL setFragment(OUString const & fragment)
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ m_base.setFragment(fragment); }
virtual void SAL_CALL clearFragment()
- throw (com::sun::star::uno::RuntimeException)
+ throw (com::sun::star::uno::RuntimeException, std::exception)
{ m_base.clearFragment(); }
- virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception);
virtual void SAL_CALL setName(OUString const & name)
- throw (css::uno::RuntimeException, css::lang::IllegalArgumentException);
+ throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception);
virtual sal_Bool SAL_CALL hasParameter(OUString const & key)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual OUString SAL_CALL getParameter(OUString const & key)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual void SAL_CALL setParameter(OUString const & key, OUString const & value)
- throw (css::uno::RuntimeException, css::lang::IllegalArgumentException);
+ throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception);
private:
UrlReference(UrlReference &); // not implemented
@@ -291,13 +291,13 @@ private:
stoc::uriproc::UriReference m_base;
};
-OUString UrlReference::getName() throw (css::uno::RuntimeException) {
+OUString UrlReference::getName() throw (css::uno::RuntimeException, std::exception) {
osl::MutexGuard g(m_base.m_mutex);
sal_Int32 i = 0;
return parsePart(m_base.m_path, true, &i);
}
-void SAL_CALL UrlReference::setName(OUString const & name) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
+void SAL_CALL UrlReference::setName(OUString const & name) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
{
if (name.isEmpty())
throw css::lang::IllegalArgumentException(
@@ -314,14 +314,14 @@ void SAL_CALL UrlReference::setName(OUString const & name) throw (css::uno::Runt
}
sal_Bool UrlReference::hasParameter(OUString const & key)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_base.m_mutex);
return findParameter(key) >= 0;
}
OUString UrlReference::getParameter(OUString const & key)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_base.m_mutex);
sal_Int32 i = findParameter(key);
@@ -329,7 +329,7 @@ OUString UrlReference::getParameter(OUString const & key)
}
void UrlReference::setParameter(OUString const & key, OUString const & value)
- throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
+ throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
{
if (key.isEmpty())
throw css::lang::IllegalArgumentException(
@@ -383,13 +383,13 @@ public:
Parser() {}
virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException);
+ getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
parse(
@@ -404,20 +404,20 @@ private:
};
OUString Parser::getImplementationName()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTscript::
getImplementationName();
}
sal_Bool Parser::supportsService(OUString const & serviceName)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, serviceName);
}
css::uno::Sequence< OUString > Parser::getSupportedServiceNames()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTscript::
getSupportedServiceNames();
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 3b7883f54f21..4d2ff0acadf8 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -53,18 +53,18 @@ public:
m_context(context) {}
virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException);
+ getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
createVndSunStarPkgUrlReference(
css::uno::Reference< css::uri::XUriReference > const & authority)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
private:
Factory(Factory &); // not implemented
@@ -76,7 +76,7 @@ private:
};
OUString Factory::getImplementationName()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return
stoc_services::VndSunStarPkgUrlReferenceFactory::
@@ -84,13 +84,13 @@ OUString Factory::getImplementationName()
}
sal_Bool Factory::supportsService(OUString const & serviceName)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, serviceName);
}
css::uno::Sequence< OUString > Factory::getSupportedServiceNames()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return stoc_services::VndSunStarPkgUrlReferenceFactory::
getSupportedServiceNames();
@@ -99,7 +99,7 @@ css::uno::Sequence< OUString > Factory::getSupportedServiceNames()
css::uno::Reference< css::uri::XUriReference >
Factory::createVndSunStarPkgUrlReference(
css::uno::Reference< css::uri::XUriReference > const & authority)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
OSL_ASSERT(authority.is());
if (authority->isAbsolute() && !authority->hasFragment()) {