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: ...@@ -67,19 +67,29 @@ public:
virtual ~MSAAServiceImpl(); virtual ~MSAAServiceImpl();
// XComponent - as used by VCL to lifecycle manage this bridge. // XComponent - as used by VCL to lifecycle manage this bridge.
virtual void SAL_CALL dispose(); virtual void SAL_CALL dispose()
virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) { /* dummy */ } throw (css::uno::RuntimeException, std::exception);
virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) { /* dummy */ } 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 // XMSAAService
virtual sal_Int64 SAL_CALL getAccObjectPtr( virtual sal_Int64 SAL_CALL getAccObjectPtr(
sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam); sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
virtual void SAL_CALL handleWindowOpened(sal_Int64); throw (css::uno::RuntimeException, std::exception);
virtual void SAL_CALL handleWindowOpened(sal_Int64)
throw (css::uno::RuntimeException, std::exception);
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName(); virtual OUString SAL_CALL getImplementationName()
virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ); throw (css::uno::RuntimeException, std::exception);
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(); 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: ...@@ -89,7 +99,7 @@ public:
*/ */
sal_Int64 MSAAServiceImpl::getAccObjectPtr( sal_Int64 MSAAServiceImpl::getAccObjectPtr(
sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam) sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
throw (RuntimeException) throw (RuntimeException, std::exception)
{ {
SolarMutexGuard g; SolarMutexGuard g;
...@@ -107,6 +117,7 @@ throw (RuntimeException) ...@@ -107,6 +117,7 @@ throw (RuntimeException)
* @return * @return
*/ */
void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc) void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc)
throw (css::uno::RuntimeException, std::exception)
{ {
SolarMutexGuard g; SolarMutexGuard g;
...@@ -120,7 +131,7 @@ void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc) ...@@ -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(); return getImplementationName_MSAAServiceImpl();
} }
...@@ -130,7 +141,7 @@ OUString MSAAServiceImpl::getImplementationName() throw (RuntimeException) ...@@ -130,7 +141,7 @@ OUString MSAAServiceImpl::getImplementationName() throw (RuntimeException)
* @param Service name. * @param Service name.
* @return If the service name is supported. * @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); return cppu::supportsService(this, serviceName);
} }
...@@ -140,7 +151,7 @@ sal_Bool MSAAServiceImpl::supportsService( OUString const & serviceName ) throw ...@@ -140,7 +151,7 @@ sal_Bool MSAAServiceImpl::supportsService( OUString const & serviceName ) throw
* @param. * @param.
* @return service name sequence. * @return service name sequence.
*/ */
Sequence< OUString > MSAAServiceImpl::getSupportedServiceNames() throw (RuntimeException) Sequence< OUString > MSAAServiceImpl::getSupportedServiceNames() throw (RuntimeException, std::exception)
{ {
return getSupportedServiceNames_MSAAServiceImpl(); return getSupportedServiceNames_MSAAServiceImpl();
} }
...@@ -271,6 +282,7 @@ MSAAServiceImpl::~MSAAServiceImpl() ...@@ -271,6 +282,7 @@ MSAAServiceImpl::~MSAAServiceImpl()
} }
void MSAAServiceImpl::dispose() void MSAAServiceImpl::dispose()
throw (css::uno::RuntimeException, std::exception)
{ {
SolarMutexGuard g; 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