diff options
Diffstat (limited to 'dtrans')
27 files changed, 119 insertions, 233 deletions
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx index 7d289a6d3365..093fedc1842b 100644 --- a/dtrans/source/cnttype/mcnttfactory.cxx +++ b/dtrans/source/cnttype/mcnttfactory.cxx @@ -44,7 +44,6 @@ CMimeContentTypeFactory::CMimeContentTypeFactory() } Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( const OUString& aContentType ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { MutexGuard aGuard( m_aMutex ); return Reference< XMimeContentType >( new CMimeContentType( aContentType ) ); @@ -53,19 +52,16 @@ Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( co // XServiceInfo OUString SAL_CALL CMimeContentTypeFactory::getImplementationName( ) - throw( RuntimeException, std::exception ) { return OUString( MIMECONTENTTYPEFACTORY_IMPL_NAME ); } sal_Bool SAL_CALL CMimeContentTypeFactory::supportsService( const OUString& ServiceName ) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL CMimeContentTypeFactory::getSupportedServiceNames( ) - throw( RuntimeException, std::exception ) { return MimeContentTypeFactory_getSupportedServiceNames( ); } diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx index 5eeb375accab..d79cd6063ff4 100644 --- a/dtrans/source/cnttype/mcnttfactory.hxx +++ b/dtrans/source/cnttype/mcnttfactory.hxx @@ -36,19 +36,15 @@ public: // XMimeContentTypeFactory - virtual css::uno::Reference< css::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const OUString& aContentType ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const OUString& aContentType ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: ::osl::Mutex m_aMutex; diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx index 180c0c48b1c7..ccc1ccfe3353 100644 --- a/dtrans/source/cnttype/mcnttype.cxx +++ b/dtrans/source/cnttype/mcnttype.cxx @@ -35,22 +35,22 @@ CMimeContentType::CMimeContentType( const OUString& aCntType ) init( aCntType ); } -OUString SAL_CALL CMimeContentType::getMediaType( ) throw(RuntimeException, std::exception) +OUString SAL_CALL CMimeContentType::getMediaType( ) { return m_MediaType; } -OUString SAL_CALL CMimeContentType::getMediaSubtype( ) throw(RuntimeException, std::exception) +OUString SAL_CALL CMimeContentType::getMediaSubtype( ) { return m_MediaSubtype; } -OUString SAL_CALL CMimeContentType::getFullMediaType( ) throw(RuntimeException, std::exception) +OUString SAL_CALL CMimeContentType::getFullMediaType( ) { return m_MediaType + "/" + m_MediaSubtype; } -Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) { MutexGuard aGuard( m_aMutex ); @@ -68,13 +68,13 @@ Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeEx return seqParams; } -sal_Bool SAL_CALL CMimeContentType::hasParameter( const OUString& aName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL CMimeContentType::hasParameter( const OUString& aName ) { MutexGuard aGuard( m_aMutex ); return ( m_ParameterMap.end( ) != m_ParameterMap.find( aName ) ); } -OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) throw(NoSuchElementException, RuntimeException, std::exception) +OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) { MutexGuard aGuard( m_aMutex ); @@ -84,7 +84,7 @@ OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) t return m_ParameterMap.find( aName )->second; } -void SAL_CALL CMimeContentType::init( const OUString& aCntType ) throw( IllegalArgumentException ) +void SAL_CALL CMimeContentType::init( const OUString& aCntType ) { if ( aCntType.isEmpty( ) ) throw IllegalArgumentException( ); diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx index 4ea11a55f4c9..45a80bbed66c 100644 --- a/dtrans/source/cnttype/mcnttype.hxx +++ b/dtrans/source/cnttype/mcnttype.hxx @@ -36,22 +36,19 @@ public: // XMimeContentType - virtual OUString SAL_CALL getMediaType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getMediaSubtype( ) throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFullMediaType( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getMediaType( ) override; + virtual OUString SAL_CALL getMediaSubtype( ) override; + virtual OUString SAL_CALL getFullMediaType( ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getParameters( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getParameters( ) override; - virtual sal_Bool SAL_CALL hasParameter( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasParameter( const OUString& aName ) override; - virtual OUString SAL_CALL getParameterValue( const OUString& aName ) - throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getParameterValue( const OUString& aName ) override; private: /// @throws css::lang::IllegalArgumentException - void SAL_CALL init( const OUString& aCntType ) throw( css::lang::IllegalArgumentException ); + void SAL_CALL init( const OUString& aCntType ); void SAL_CALL getSym(); void SAL_CALL acceptSym( const OUString& pSymTlb ); void SAL_CALL skipSpaces(); diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx index 727724e347aa..12a8b11f9d50 100644 --- a/dtrans/source/generic/clipboardmanager.cxx +++ b/dtrans/source/generic/clipboardmanager.cxx @@ -44,25 +44,21 @@ ClipboardManager::~ClipboardManager() } OUString SAL_CALL ClipboardManager::getImplementationName( ) - throw(RuntimeException) { return OUString(CLIPBOARDMANAGER_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ClipboardManager::supportsService( const OUString& ServiceName ) - throw(RuntimeException) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL ClipboardManager::getSupportedServiceNames( ) - throw(RuntimeException) { return ClipboardManager_getSupportedServiceNames(); } Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString& aName ) - throw(NoSuchElementException, RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -81,7 +77,6 @@ Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString& } void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xClipboard ) - throw(IllegalArgumentException, ElementExistException, RuntimeException) { OSL_ASSERT(xClipboard.is()); @@ -119,7 +114,6 @@ void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xCl } void SAL_CALL ClipboardManager::removeClipboard( const OUString& aName ) - throw(RuntimeException) { MutexGuard aGuard(m_aMutex); if (!rBHelper.bDisposed) @@ -127,7 +121,6 @@ void SAL_CALL ClipboardManager::removeClipboard( const OUString& aName ) } Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames() - throw(RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -142,7 +135,6 @@ Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames() } void SAL_CALL ClipboardManager::dispose() - throw(RuntimeException) { ClearableMutexGuard aGuard( rBHelper.rMutex ); if (!rBHelper.bDisposed && !rBHelper.bInDispose) @@ -188,7 +180,6 @@ void SAL_CALL ClipboardManager::dispose() } void SAL_CALL ClipboardManager::disposing( const EventObject& event ) - throw(RuntimeException) { Reference < XClipboard > xClipboard(event.Source, UNO_QUERY); diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx index 80b179712eda..9cbccb9dcc3d 100644 --- a/dtrans/source/generic/clipboardmanager.hxx +++ b/dtrans/source/generic/clipboardmanager.hxx @@ -56,47 +56,35 @@ namespace dtrans * XServiceInfo */ - virtual OUString SAL_CALL getImplementationName( ) - throw(css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(css::uno::RuntimeException) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; /* * XComponent */ - virtual void SAL_CALL dispose() - throw(css::uno::RuntimeException) override; + virtual void SAL_CALL dispose() override; /* * XEventListener */ - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw(css::uno::RuntimeException) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; /* * XClipboardManager */ - virtual css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& aName ) - throw(css::container::NoSuchElementException, - css::uno::RuntimeException) override; + virtual css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& aName ) override; - virtual void SAL_CALL addClipboard( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard ) - throw(css::lang::IllegalArgumentException, - css::container::ElementExistException, - css::uno::RuntimeException) override; + virtual void SAL_CALL addClipboard( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard ) override; - virtual void SAL_CALL removeClipboard( const OUString& aName ) - throw(css::uno::RuntimeException) override; + virtual void SAL_CALL removeClipboard( const OUString& aName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL listClipboardNames( ) - throw(css::uno::RuntimeException) override; + virtual css::uno::Sequence< OUString > SAL_CALL listClipboardNames( ) override; }; diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx index ed26637cbf9b..c9477e068c7f 100644 --- a/dtrans/source/generic/generic_clipboard.cxx +++ b/dtrans/source/generic/generic_clipboard.cxx @@ -42,7 +42,6 @@ GenericClipboard::~GenericClipboard() } void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments ) - throw(Exception, RuntimeException) { if (!m_bInitialized) { @@ -56,25 +55,21 @@ void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments ) } OUString SAL_CALL GenericClipboard::getImplementationName( ) - throw(RuntimeException) { return OUString(GENERIC_CLIPBOARD_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL GenericClipboard::supportsService( const OUString& ServiceName ) - throw(RuntimeException) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL GenericClipboard::getSupportedServiceNames( ) - throw(RuntimeException) { return GenericClipboard_getSupportedServiceNames(); } Reference< XTransferable > SAL_CALL GenericClipboard::getContents() - throw(RuntimeException) { MutexGuard aGuard(m_aMutex); return m_aContents; @@ -82,7 +77,6 @@ Reference< XTransferable > SAL_CALL GenericClipboard::getContents() void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xTrans, const Reference< XClipboardOwner >& xClipboardOwner ) - throw(RuntimeException) { // remember old values for callbacks before setting the new ones. ClearableMutexGuard aGuard(m_aMutex); @@ -117,19 +111,16 @@ void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xT } OUString SAL_CALL GenericClipboard::getName() - throw(RuntimeException) { return m_aName; } sal_Int8 SAL_CALL GenericClipboard::getRenderingCapabilities() - throw(RuntimeException) { return RenderingCapabilities::Delayed; } void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboardListener >& listener ) - throw(RuntimeException) { MutexGuard aGuard( rBHelper.rMutex ); OSL_ENSURE( !rBHelper.bInDispose, "do not add listeners in the dispose call" ); @@ -139,7 +130,6 @@ void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboar } void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener ) - throw(RuntimeException) { MutexGuard aGuard( rBHelper.rMutex ); OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" ); diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx index c336cabef1e7..f245096e9c60 100644 --- a/dtrans/source/generic/generic_clipboard.hxx +++ b/dtrans/source/generic/generic_clipboard.hxx @@ -57,55 +57,45 @@ namespace dtrans * XInitialization */ - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw(css::uno::Exception, css::uno::RuntimeException) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; /* * XServiceInfo */ - virtual OUString SAL_CALL getImplementationName( ) - throw(css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(css::uno::RuntimeException) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; /* * XClipboard */ - virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents() - throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents() override; virtual void SAL_CALL setContents( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans, - const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw(css::uno::RuntimeException) override; + const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override; - virtual OUString SAL_CALL getName() - throw(css::uno::RuntimeException) override; + virtual OUString SAL_CALL getName() override; /* * XClipboardEx */ - virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw(css::uno::RuntimeException) override; + virtual sal_Int8 SAL_CALL getRenderingCapabilities() override; /* * XClipboardNotifier */ virtual void SAL_CALL addClipboardListener( - const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) - throw(css::uno::RuntimeException) override; + const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; virtual void SAL_CALL removeClipboardListener( - const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) - throw(css::uno::RuntimeException) override; + const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; }; diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx index 76d7b06c95c4..7abe063615ef 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.cxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx @@ -73,7 +73,7 @@ CWinClipbImpl::~CWinClipbImpl( ) unregisterClipboardViewer( ); } -Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( RuntimeException ) +Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) { // use the shortcut or create a transferable from // system clipboard @@ -110,7 +110,6 @@ Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( Runtime void SAL_CALL CWinClipbImpl::setContents( const Reference< XTransferable >& xTransferable, const Reference< XClipboardOwner >& xClipboardOwner ) - throw( RuntimeException ) { IDataObjectPtr pIDataObj; @@ -132,17 +131,17 @@ void SAL_CALL CWinClipbImpl::setContents( m_MtaOleClipboard.setClipboard(pIDataObj.get()); } -OUString SAL_CALL CWinClipbImpl::getName( ) throw( RuntimeException ) +OUString SAL_CALL CWinClipbImpl::getName( ) { return m_itsName; } -sal_Int8 SAL_CALL CWinClipbImpl::getRenderingCapabilities( ) throw( RuntimeException ) +sal_Int8 SAL_CALL CWinClipbImpl::getRenderingCapabilities( ) { return ( Delayed | Persistant ); } -void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException ) +void SAL_CALL CWinClipbImpl::flushClipboard( ) { // actually it should be ClearableMutexGuard aGuard( m_ClipContentMutex ); // but it does not work since FlushClipboard does a callback and frees DataObject @@ -168,7 +167,7 @@ void SAL_CALL CWinClipbImpl::unregisterClipboardViewer( ) m_MtaOleClipboard.registerClipViewer( nullptr ); } -void SAL_CALL CWinClipbImpl::dispose() throw( RuntimeException ) +void SAL_CALL CWinClipbImpl::dispose() { OSL_ENSURE( !m_pCurrentClipContent, "Clipboard was not flushed before shutdown!" ); } diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx index 64024db385ac..0b74185ec52d 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.hxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx @@ -49,27 +49,31 @@ public: protected: CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* theWinClipboard ); - css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents( ) - throw( css::uno::RuntimeException ); + /// @throws css::uno::RuntimeException + css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents( ); + /// @throws css::uno::RuntimeException void SAL_CALL setContents( const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable, - const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw( css::uno::RuntimeException ); + const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ); - OUString SAL_CALL getName( ) throw( css::uno::RuntimeException ); + /// @throws css::uno::RuntimeException + OUString SAL_CALL getName( ); // XClipboardEx - static sal_Int8 SAL_CALL getRenderingCapabilities( ) throw( css::uno::RuntimeException ); + /// @throws css::uno::RuntimeException + static sal_Int8 SAL_CALL getRenderingCapabilities( ); // XFlushableClipboard - void SAL_CALL flushClipboard( ) throw( css::uno::RuntimeException ); + /// @throws css::uno::RuntimeException + void SAL_CALL flushClipboard( ); // XComponent - void SAL_CALL dispose( ) throw( css::uno::RuntimeException ); + /// @throws css::uno::RuntimeException + void SAL_CALL dispose( ); // member functions diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx index 1e960d4783fc..a0dd569fb091 100644 --- a/dtrans/source/win32/clipb/WinClipboard.cxx +++ b/dtrans/source/win32/clipb/WinClipboard.cxx @@ -61,7 +61,7 @@ CWinClipboard::CWinClipboard( const Reference< XComponentContext >& rxContext, c // and so on, we simply return the original XTransferable instead of our // DOTransferable -Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) throw( RuntimeException ) +Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) { MutexGuard aGuard( m_aMutex ); @@ -77,7 +77,6 @@ Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) throw( Runtime void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTransferable, const Reference< XClipboardOwner >& xClipboardOwner ) - throw( RuntimeException ) { MutexGuard aGuard( m_aMutex ); @@ -89,7 +88,7 @@ void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTra m_pImpl->setContents( xTransferable, xClipboardOwner ); } -OUString SAL_CALL CWinClipboard::getName( ) throw( RuntimeException ) +OUString SAL_CALL CWinClipboard::getName( ) { if ( rBHelper.bDisposed ) throw DisposedException("object is already disposed", @@ -103,7 +102,7 @@ OUString SAL_CALL CWinClipboard::getName( ) throw( RuntimeException ) // XFlushableClipboard -void SAL_CALL CWinClipboard::flushClipboard( ) throw( RuntimeException ) +void SAL_CALL CWinClipboard::flushClipboard( ) { MutexGuard aGuard( m_aMutex ); @@ -117,7 +116,7 @@ void SAL_CALL CWinClipboard::flushClipboard( ) throw( RuntimeException ) // XClipboardEx -sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities( ) throw( RuntimeException ) +sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities( ) { if ( rBHelper.bDisposed ) throw DisposedException("object is already disposed", @@ -132,7 +131,6 @@ sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities( ) throw( RuntimeExce // XClipboardNotifier void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardListener >& listener ) - throw( RuntimeException ) { if ( rBHelper.bDisposed ) throw DisposedException("object is already disposed", @@ -148,7 +146,6 @@ void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardLi } void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener ) - throw( RuntimeException ) { if ( rBHelper.bDisposed ) throw DisposedException("object is already disposed", @@ -225,19 +222,16 @@ void SAL_CALL CWinClipboard::disposing() // XServiceInfo OUString SAL_CALL CWinClipboard::getImplementationName( ) - throw(RuntimeException) { return OUString( WINCLIPBOARD_IMPL_NAME ); } sal_Bool SAL_CALL CWinClipboard::supportsService( const OUString& ServiceName ) - throw(RuntimeException) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL CWinClipboard::getSupportedServiceNames( ) - throw(RuntimeException) { return WinClipboard_getSupportedServiceNames(); } diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx index b85a03e008b8..4e4ddc9a7c3d 100644 --- a/dtrans/source/win32/clipb/WinClipboard.hxx +++ b/dtrans/source/win32/clipb/WinClipboard.hxx @@ -71,34 +71,29 @@ public: // XClipboard - virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents( ) - throw( css::uno::RuntimeException ) override; + virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents( ) override; virtual void SAL_CALL setContents( const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable, - const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw( css::uno::RuntimeException ) override; + const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override; - virtual OUString SAL_CALL getName( ) - throw( css::uno::RuntimeException ) override; + virtual OUString SAL_CALL getName( ) override; // XFlushableClipboard - virtual void SAL_CALL flushClipboard( ) throw( css::uno::RuntimeException ) override; + virtual void SAL_CALL flushClipboard( ) override; // XClipboardEx - virtual sal_Int8 SAL_CALL getRenderingCapabilities( ) throw( css::uno::RuntimeException ) override; + virtual sal_Int8 SAL_CALL getRenderingCapabilities( ) override; // XClipboardNotifier virtual void SAL_CALL addClipboardListener( - const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) - throw( css::uno::RuntimeException ) override; + const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; virtual void SAL_CALL removeClipboardListener( - const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) - throw( css::uno::RuntimeException ) override; + const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; // overwrite base class method, which is called // by base class dispose function @@ -107,14 +102,11 @@ public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw(css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(css::uno::RuntimeException) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: void SAL_CALL notifyAllClipboardListener( ); diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx index 85eb0d8c0d9f..39c0bc472f2c 100644 --- a/dtrans/source/win32/dnd/source.cxx +++ b/dtrans/source/win32/dnd/source.cxx @@ -137,7 +137,6 @@ void DragSource::StartDragImpl( // XInitialization /** aArguments contains a machine id */ void SAL_CALL DragSource::initialize( const Sequence< Any >& aArguments ) - throw(Exception, RuntimeException) { if( aArguments.getLength() >=2) m_hAppWindow= reinterpret_cast<HWND>(static_cast<sal_uIntPtr>(*o3tl::doAccess<sal_uInt64>(aArguments[1]))); @@ -146,13 +145,11 @@ void SAL_CALL DragSource::initialize( const Sequence< Any >& aArguments ) /** XDragSource */ sal_Bool SAL_CALL DragSource::isDragImageSupported( ) - throw(RuntimeException) { return false; } sal_Int32 SAL_CALL DragSource::getDefaultCursor( sal_Int8 /*dragAction*/ ) - throw( IllegalArgumentException, RuntimeException) { return 0; } @@ -165,7 +162,7 @@ void SAL_CALL DragSource::startDrag( sal_Int32 cursor, sal_Int32 image, const Reference<XTransferable >& trans, - const Reference<XDragSourceListener >& listener ) throw( RuntimeException) + const Reference<XDragSourceListener >& listener ) { // Allow only one running dnd operation at a time, // see XDragSource documentation @@ -287,17 +284,17 @@ dwEffect } // XServiceInfo -OUString SAL_CALL DragSource::getImplementationName( ) throw (RuntimeException) +OUString SAL_CALL DragSource::getImplementationName( ) { return OUString(DNDSOURCE_IMPL_NAME); } // XServiceInfo -sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames( ) { OUString names[1]= {OUString(DNDSOURCE_SERVICE_NAME)}; diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx index 47ab118b0a0a..52d4bab1982f 100644 --- a/dtrans/source/win32/dnd/source.hxx +++ b/dtrans/source/win32/dnd/source.hxx @@ -89,25 +89,22 @@ public: DragSource &operator= ( const DragSource&) = delete; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) - throw(Exception, RuntimeException) override; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override; // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported( ) throw(RuntimeException) override; - virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) - throw( IllegalArgumentException, RuntimeException) override; + virtual sal_Bool SAL_CALL isDragImageSupported( ) override; + virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) override; virtual void SAL_CALL startDrag( const DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const Reference<XTransferable >& trans, - const Reference<XDragSourceListener >& listener ) - throw( RuntimeException) override; + const Reference<XDragSourceListener >& listener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; virtual HRESULT STDMETHODCALLTYPE QueryInterface( /* [in] */ REFIID riid, diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx index 3408c2913359..08adfaaea0cb 100644 --- a/dtrans/source/win32/dnd/sourcecontext.cxx +++ b/dtrans/source/win32/dnd/sourcecontext.cxx @@ -42,34 +42,28 @@ SourceContext::~SourceContext() void SAL_CALL SourceContext::addDragSourceListener( const Reference<XDragSourceListener >& ) - throw( RuntimeException) { } void SAL_CALL SourceContext::removeDragSourceListener( const Reference<XDragSourceListener >& ) - throw( RuntimeException) { } sal_Int32 SAL_CALL SourceContext::getCurrentCursor( ) - throw( RuntimeException) { return 0; } void SAL_CALL SourceContext::setCursor( sal_Int32 /*cursorId*/ ) - throw( RuntimeException) { } void SAL_CALL SourceContext::setImage( sal_Int32 /*imageId*/ ) - throw( RuntimeException) { } void SAL_CALL SourceContext::transferablesFlavorsChanged( ) - throw( RuntimeException) { } diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx index b70a0cec8ead..8e76a36b3a36 100644 --- a/dtrans/source/win32/dnd/sourcecontext.hxx +++ b/dtrans/source/win32/dnd/sourcecontext.hxx @@ -50,18 +50,14 @@ public: SourceContext(const SourceContext&) = delete; SourceContext &operator= (const SourceContext&) = delete; - virtual void SAL_CALL addDragSourceListener( const Reference<XDragSourceListener >& dsl ) - throw( RuntimeException); - virtual void SAL_CALL removeDragSourceListener( const Reference<XDragSourceListener >& dsl ) - throw( RuntimeException); - virtual sal_Int32 SAL_CALL getCurrentCursor( ) - throw( RuntimeException) override; - virtual void SAL_CALL setCursor( sal_Int32 cursorId ) - throw( RuntimeException) override; - virtual void SAL_CALL setImage( sal_Int32 imageId ) - throw( RuntimeException) override; - virtual void SAL_CALL transferablesFlavorsChanged( ) - throw( RuntimeException) override; + /// @throws RuntimeException + virtual void SAL_CALL addDragSourceListener( const Reference<XDragSourceListener >& dsl ); + /// @throws RuntimeException + virtual void SAL_CALL removeDragSourceListener( const Reference<XDragSourceListener >& dsl ); + virtual sal_Int32 SAL_CALL getCurrentCursor( ) override; + virtual void SAL_CALL setCursor( sal_Int32 cursorId ) override; + virtual void SAL_CALL setImage( sal_Int32 imageId ) override; + virtual void SAL_CALL transferablesFlavorsChanged( ) override; // non - interface functions void fire_dragDropEnd( bool success, sal_Int8 byte); diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx index a9f6ae477226..b797d4e769d8 100644 --- a/dtrans/source/win32/dnd/target.cxx +++ b/dtrans/source/win32/dnd/target.cxx @@ -102,7 +102,6 @@ void SAL_CALL DropTarget::disposing() } void SAL_CALL DropTarget::initialize( const Sequence< Any >& aArguments ) - throw(Exception, RuntimeException) { // The window must be registered for Dnd by RegisterDragDrop. We must ensure // that RegisterDragDrop is called from an STA ( OleInitialize) thread. @@ -247,17 +246,17 @@ DWORD WINAPI DndTargetOleSTAFunc(LPVOID pParams) } // XServiceInfo -OUString SAL_CALL DropTarget::getImplementationName( ) throw (RuntimeException) +OUString SAL_CALL DropTarget::getImplementationName( ) { return OUString(DNDTARGET_IMPL_NAME); } // XServiceInfo -sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames( ) { OUString names[1]= {OUString(DNDTARGET_SERVICE_NAME)}; return Sequence<OUString>(names, 1); @@ -265,34 +264,32 @@ Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames( ) throw (Ru // XDropTarget void SAL_CALL DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& dtl ) - throw(RuntimeException) { rBHelper.addListener( cppu::UnoType<decltype(dtl)>::get(), dtl ); } void SAL_CALL DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& dtl ) - throw(RuntimeException) { rBHelper.removeListener( cppu::UnoType<decltype(dtl)>::get(), dtl ); } -sal_Bool SAL_CALL DropTarget::isActive( ) throw(RuntimeException) +sal_Bool SAL_CALL DropTarget::isActive( ) { return m_bActive; //m_bDropTargetRegistered; } -void SAL_CALL DropTarget::setActive( sal_Bool _b ) throw(RuntimeException) +void SAL_CALL DropTarget::setActive( sal_Bool _b ) { MutexGuard g(m_mutex); m_bActive= _b; } -sal_Int8 SAL_CALL DropTarget::getDefaultActions( ) throw(RuntimeException) +sal_Int8 SAL_CALL DropTarget::getDefaultActions( ) { return m_nDefaultActions; } -void SAL_CALL DropTarget::setDefaultActions( sal_Int8 actions ) throw(RuntimeException) +void SAL_CALL DropTarget::setDefaultActions( sal_Int8 actions ) { OSL_ENSURE( actions < 8, "No valid default actions"); m_nDefaultActions= actions; diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx index ada9301a04f1..49fde8e0c914 100644 --- a/dtrans/source/win32/dnd/target.hxx +++ b/dtrans/source/win32/dnd/target.hxx @@ -117,24 +117,21 @@ public: // Must be called. virtual void SAL_CALL disposing() override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) - throw(Exception, RuntimeException) override; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override; // XDropTarget - virtual void SAL_CALL addDropTargetListener( const Reference< XDropTargetListener >& dtl ) - throw(RuntimeException) override; - virtual void SAL_CALL removeDropTargetListener( const Reference< XDropTargetListener >& dtl ) - throw(RuntimeException) override; + virtual void SAL_CALL addDropTargetListener( const Reference< XDropTargetListener >& dtl ) override; + virtual void SAL_CALL removeDropTargetListener( const Reference< XDropTargetListener >& dtl ) override; // Default is not active - virtual sal_Bool SAL_CALL isActive( ) throw(RuntimeException) override; - virtual void SAL_CALL setActive( sal_Bool isActive ) throw(RuntimeException) override; - virtual sal_Int8 SAL_CALL getDefaultActions( ) throw(RuntimeException) override; - virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(RuntimeException) override; + virtual sal_Bool SAL_CALL isActive( ) override; + virtual void SAL_CALL setActive( sal_Bool isActive ) override; + virtual sal_Int8 SAL_CALL getDefaultActions( ) override; + virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // Functions called from the IDropTarget implementation ( m_pDropTarget) virtual HRESULT DragEnter( diff --git a/dtrans/source/win32/dnd/targetdragcontext.cxx b/dtrans/source/win32/dnd/targetdragcontext.cxx index 425f9d38707d..4ffd16123d9d 100644 --- a/dtrans/source/win32/dnd/targetdragcontext.cxx +++ b/dtrans/source/win32/dnd/targetdragcontext.cxx @@ -31,13 +31,11 @@ TargetDragContext::~TargetDragContext() } void SAL_CALL TargetDragContext::acceptDrag( sal_Int8 dragOperation ) - throw( RuntimeException) { m_pDropTarget->_acceptDrag( dragOperation, static_cast<XDropTargetDragContext*>( this) ); } void SAL_CALL TargetDragContext::rejectDrag( ) - throw( RuntimeException) { m_pDropTarget->_rejectDrag( static_cast<XDropTargetDragContext*>( this) ); } diff --git a/dtrans/source/win32/dnd/targetdragcontext.hxx b/dtrans/source/win32/dnd/targetdragcontext.hxx index 00c3d40d2382..a8f48cad193e 100644 --- a/dtrans/source/win32/dnd/targetdragcontext.hxx +++ b/dtrans/source/win32/dnd/targetdragcontext.hxx @@ -43,10 +43,8 @@ public: TargetDragContext( const TargetDragContext&) = delete; TargetDragContext &operator= ( const TargetDragContext&) = delete; - virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) - throw( RuntimeException) override; - virtual void SAL_CALL rejectDrag( ) - throw( RuntimeException) override; + virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) override; + virtual void SAL_CALL rejectDrag( ) override; }; #endif diff --git a/dtrans/source/win32/dnd/targetdropcontext.cxx b/dtrans/source/win32/dnd/targetdropcontext.cxx index 93705a2dba9d..9719664a9fbb 100644 --- a/dtrans/source/win32/dnd/targetdropcontext.cxx +++ b/dtrans/source/win32/dnd/targetdropcontext.cxx @@ -36,19 +36,16 @@ TargetDropContext::~TargetDropContext() } void SAL_CALL TargetDropContext::acceptDrop( sal_Int8 dropOperation ) - throw( RuntimeException) { m_pDropTarget->_acceptDrop( dropOperation, static_cast<XDropTargetDropContext*>( this) ); } void SAL_CALL TargetDropContext::rejectDrop( ) - throw( RuntimeException) { m_pDropTarget->_rejectDrop( static_cast<XDropTargetDropContext*>( this) ); } void SAL_CALL TargetDropContext::dropComplete( sal_Bool success ) - throw( RuntimeException) { m_pDropTarget->_dropComplete( success, static_cast<XDropTargetDropContext*>( this) ); } diff --git a/dtrans/source/win32/dnd/targetdropcontext.hxx b/dtrans/source/win32/dnd/targetdropcontext.hxx index f240e6897fbb..b7db849fe4e1 100644 --- a/dtrans/source/win32/dnd/targetdropcontext.hxx +++ b/dtrans/source/win32/dnd/targetdropcontext.hxx @@ -43,14 +43,11 @@ public: TargetDropContext &operator= ( const TargetDropContext&) = delete; // XDropTargetDragContext - virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) - throw( RuntimeException) override; - virtual void SAL_CALL rejectDrop( ) - throw( RuntimeException) override; + virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) override; + virtual void SAL_CALL rejectDrop( ) override; // XDropTargetDropContext (inherits XDropTargetDragContext) - virtual void SAL_CALL dropComplete( sal_Bool success ) - throw( RuntimeException) override; + virtual void SAL_CALL dropComplete( sal_Bool success ) override; }; #endif diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index c6dd59fdb800..0feb5c12e8d8 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -191,7 +191,6 @@ CDOTransferable::CDOTransferable( } Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor ) - throw( UnsupportedFlavorException, IOException, RuntimeException ) { OSL_ASSERT( isValidFlavor( aFlavor ) ); @@ -248,7 +247,6 @@ Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor ) // getTransferDataFlavors Sequence< DataFlavor > SAL_CALL CDOTransferable::getTransferDataFlavors( ) - throw( RuntimeException ) { return m_FlavorList; } @@ -258,7 +256,6 @@ Sequence< DataFlavor > SAL_CALL CDOTransferable::getTransferDataFlavors( ) // DataType sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFlavor ) - throw( RuntimeException ) { OSL_ASSERT( isValidFlavor( aFlavor ) ); @@ -528,7 +525,6 @@ bool SAL_CALL CDOTransferable::compareDataFlavors( } css::uno::Any SAL_CALL CDOTransferable::getData( const Sequence< sal_Int8>& aProcessId ) - throw (css::uno::RuntimeException) { Any retVal; diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx index ab08e22e286a..0099f3f4b4dd 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.hxx +++ b/dtrans/source/win32/dtobj/DOTransferable.hxx @@ -45,19 +45,15 @@ public: // XTransferable - virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) - throw( css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException ) override; + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override; - virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw( css::uno::RuntimeException ) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) - throw( css::uno::RuntimeException ) override; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override; // XSystemTransferable - virtual css::uno::Any SAL_CALL getData( const css::uno::Sequence<sal_Int8>& aProcessId ) throw - (css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getData( const css::uno::Sequence<sal_Int8>& aProcessId ) override; private: explicit CDOTransferable( diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx index 1c13d346aa5a..cc3c86de7d03 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.cxx +++ b/dtrans/source/win32/dtobj/XTDataObject.cxx @@ -100,8 +100,7 @@ public: : maTransferable(rTransferable) {} - virtual void SAL_CALL notify(css::uno::Any const &) - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL notify(css::uno::Any const &) override { maTransferable.set(nullptr); } diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 3350211d07d6..8b96cdd6c3dd 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -469,7 +469,6 @@ CDataFormatTranslatorUNO::CDataFormatTranslatorUNO( const Reference< XComponentC } Any SAL_CALL CDataFormatTranslatorUNO::getSystemDataTypeFromDataFlavor( const DataFlavor& aDataFlavor ) - throw( RuntimeException ) { Any aAny; @@ -524,7 +523,6 @@ Any SAL_CALL CDataFormatTranslatorUNO::getSystemDataTypeFromDataFlavor( const Da } DataFlavor SAL_CALL CDataFormatTranslatorUNO::getDataFlavorFromSystemDataType( const Any& aSysDataType ) - throw( RuntimeException ) { OSL_PRECOND( aSysDataType.hasValue( ), "Empty system data type delivered" ); @@ -553,19 +551,16 @@ DataFlavor SAL_CALL CDataFormatTranslatorUNO::getDataFlavorFromSystemDataType( c // XServiceInfo OUString SAL_CALL CDataFormatTranslatorUNO::getImplementationName( ) - throw( RuntimeException ) { return OUString( IMPL_NAME ); } sal_Bool SAL_CALL CDataFormatTranslatorUNO::supportsService( const OUString& ServiceName ) - throw( RuntimeException ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL CDataFormatTranslatorUNO::getSupportedServiceNames( ) - throw( RuntimeException ) { return DataFormatTranslator_getSupportedServiceNames( ); } diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx index 82d148f025ea..6859e0d53774 100644 --- a/dtrans/source/win32/ftransl/ftransl.hxx +++ b/dtrans/source/win32/ftransl/ftransl.hxx @@ -49,22 +49,17 @@ public: // XDataFormatTranslator - virtual css::uno::Any SAL_CALL getSystemDataTypeFromDataFlavor( const css::datatransfer::DataFlavor& aDataFlavor ) - throw(css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getSystemDataTypeFromDataFlavor( const css::datatransfer::DataFlavor& aDataFlavor ) override; - virtual css::datatransfer::DataFlavor SAL_CALL getDataFlavorFromSystemDataType( const css::uno::Any& aSysDataType ) - throw(css::uno::RuntimeException) override; + virtual css::datatransfer::DataFlavor SAL_CALL getDataFlavorFromSystemDataType( const css::uno::Any& aSysDataType ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw(css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(css::uno::RuntimeException) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: const css::uno::Reference< css::uno::XComponentContext > m_xContext; |