summaryrefslogtreecommitdiff
path: root/framework/source/services/substitutepathvars.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /framework/source/services/substitutepathvars.cxx
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework/source/services/substitutepathvars.cxx')
-rw-r--r--framework/source/services/substitutepathvars.cxx33
1 files changed, 9 insertions, 24 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 861c973a3f1d..2f38a872a094 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -137,31 +137,25 @@ class SubstitutePathVariables : private cppu::BaseMutex,
public:
explicit SubstitutePathVariables(const css::uno::Reference< css::uno::XComponentContext >& xContext);
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.PathSubstitution");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.util.PathSubstitution"};
}
// XStringSubstitution
- virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) override;
+ virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) override;
+ virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) override;
protected:
void SetPredefinedPathVariables();
@@ -177,15 +171,12 @@ protected:
// XStringSubstitution implementation methods
/// @throws css::container::NoSuchElementException
/// @throws css::uno::RuntimeException
- OUString impl_substituteVariable( const OUString& aText, bool bSustRequired )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException);
+ OUString impl_substituteVariable( const OUString& aText, bool bSustRequired );
/// @throws css::uno::RuntimeException
- OUString impl_reSubstituteVariables( const OUString& aText )
- throw (css::uno::RuntimeException);
+ OUString impl_reSubstituteVariables( const OUString& aText );
/// @throws css::container::NoSuchElementException
/// @throws css::uno::RuntimeException
- OUString const & impl_getSubstituteVariableValue( const OUString& variable )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException);
+ OUString const & impl_getSubstituteVariableValue( const OUString& variable );
private:
typedef std::unordered_map<OUString, PreDefVariable, OUStringHash>
@@ -234,21 +225,18 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XComponentCon
// XStringSubstitution
OUString SAL_CALL SubstitutePathVariables::substituteVariables( const OUString& aText, sal_Bool bSubstRequired )
-throw ( NoSuchElementException, RuntimeException, std::exception )
{
osl::MutexGuard g(rBHelper.rMutex);
return impl_substituteVariable( aText, bSubstRequired );
}
OUString SAL_CALL SubstitutePathVariables::reSubstituteVariables( const OUString& aText )
-throw ( RuntimeException, std::exception )
{
osl::MutexGuard g(rBHelper.rMutex);
return impl_reSubstituteVariables( aText );
}
OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const OUString& aVariable )
-throw ( NoSuchElementException, RuntimeException, std::exception )
{
osl::MutexGuard g(rBHelper.rMutex);
return impl_getSubstituteVariableValue( aVariable );
@@ -326,7 +314,6 @@ OUString SubstitutePathVariables::GetPathVariableValue() const
}
OUString SubstitutePathVariables::impl_substituteVariable( const OUString& rText, bool bSubstRequired )
-throw ( NoSuchElementException, RuntimeException )
{
// This is maximal recursive depth supported!
const sal_Int32 nMaxRecursiveDepth = 8;
@@ -513,7 +500,6 @@ throw ( NoSuchElementException, RuntimeException )
}
OUString SubstitutePathVariables::impl_reSubstituteVariables( const OUString& rURL )
-throw ( RuntimeException )
{
OUString aURL;
@@ -594,7 +580,6 @@ throw ( RuntimeException )
// This method support both request schemes "$("<varname>")" or "<varname>".
OUString const & SubstitutePathVariables::impl_getSubstituteVariableValue( const OUString& rVariable )
-throw ( NoSuchElementException, RuntimeException )
{
OUString aVariable;