Kaydet (Commit) cb0529cc authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-Werror,-Wmicrosoft-exception-spec

Change-Id: I71983978713eedbd1250083e607bfadaa824c2ef
üst b2a953f3
......@@ -67,19 +67,29 @@ public:
virtual ~MSAAServiceImpl();
// XComponent - as used by VCL to lifecycle manage this bridge.
virtual void SAL_CALL dispose();
virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) { /* dummy */ }
virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) { /* dummy */ }
virtual void SAL_CALL dispose()
throw (css::uno::RuntimeException, std::exception);
virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& )
throw (css::uno::RuntimeException, std::exception)
{ /* dummy */ }
virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& )
throw (css::uno::RuntimeException, std::exception)
{ /* dummy */ }
// XMSAAService
virtual sal_Int64 SAL_CALL getAccObjectPtr(
sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam);
virtual void SAL_CALL handleWindowOpened(sal_Int64);
sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
throw (css::uno::RuntimeException, std::exception);
virtual void SAL_CALL handleWindowOpened(sal_Int64)
throw (css::uno::RuntimeException, std::exception);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName();
virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName );
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames();
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName )
throw (css::uno::RuntimeException, std::exception);
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception);
};
/**
......@@ -89,7 +99,7 @@ public:
*/
sal_Int64 MSAAServiceImpl::getAccObjectPtr(
sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
throw (RuntimeException)
throw (RuntimeException, std::exception)
{
SolarMutexGuard g;
......@@ -107,6 +117,7 @@ throw (RuntimeException)
* @return
*/
void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc)
throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
......@@ -120,7 +131,7 @@ void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc)
}
}
OUString MSAAServiceImpl::getImplementationName() throw (RuntimeException)
OUString MSAAServiceImpl::getImplementationName() throw (RuntimeException, std::exception)
{
return getImplementationName_MSAAServiceImpl();
}
......@@ -130,7 +141,7 @@ OUString MSAAServiceImpl::getImplementationName() throw (RuntimeException)
* @param Service name.
* @return If the service name is supported.
*/
sal_Bool MSAAServiceImpl::supportsService( OUString const & serviceName ) throw (RuntimeException)
sal_Bool MSAAServiceImpl::supportsService( OUString const & serviceName ) throw (RuntimeException, std::exception)
{
return cppu::supportsService(this, serviceName);
}
......@@ -140,7 +151,7 @@ sal_Bool MSAAServiceImpl::supportsService( OUString const & serviceName ) throw
* @param.
* @return service name sequence.
*/
Sequence< OUString > MSAAServiceImpl::getSupportedServiceNames() throw (RuntimeException)
Sequence< OUString > MSAAServiceImpl::getSupportedServiceNames() throw (RuntimeException, std::exception)
{
return getSupportedServiceNames_MSAAServiceImpl();
}
......@@ -271,6 +282,7 @@ MSAAServiceImpl::~MSAAServiceImpl()
}
void MSAAServiceImpl::dispose()
throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment