diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /vcl/source | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/app/dndhelp.cxx | 26 | ||||
-rw-r--r-- | vcl/source/app/session.cxx | 24 | ||||
-rw-r--r-- | vcl/source/app/svdata.cxx | 4 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 8 | ||||
-rw-r--r-- | vcl/source/app/unohelp2.cxx | 8 | ||||
-rw-r--r-- | vcl/source/components/dtranscomp.cxx | 88 | ||||
-rw-r--r-- | vcl/source/components/fontident.cxx | 20 | ||||
-rw-r--r-- | vcl/source/control/edit.cxx | 12 | ||||
-rw-r--r-- | vcl/source/edit/textview.cxx | 28 | ||||
-rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 12 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl2.cxx | 2 | ||||
-rw-r--r-- | vcl/source/helper/canvasbitmap.cxx | 64 | ||||
-rw-r--r-- | vcl/source/helper/canvastools.cxx | 22 | ||||
-rw-r--r-- | vcl/source/helper/xconnection.cxx | 10 | ||||
-rw-r--r-- | vcl/source/window/dndevdis.cxx | 18 | ||||
-rw-r--r-- | vcl/source/window/dndlcon.cxx | 28 |
17 files changed, 190 insertions, 190 deletions
diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx index 54b31c6bf33f..05c2f9d12562 100644 --- a/vcl/source/app/dndhelp.cxx +++ b/vcl/source/app/dndhelp.cxx @@ -101,7 +101,7 @@ vcl::unohelper::DragAndDropWrapper::~DragAndDropWrapper() } // uno::XInterface -uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< ::com::sun::star::lang::XEventListener* >( (::com::sun::star::datatransfer::dnd::XDragGestureListener*)this) ), @@ -112,7 +112,7 @@ uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & r } // ::com::sun::star::lang::XEventListener -void vcl::unohelper::DragAndDropWrapper::disposing( const ::com::sun::star::lang::EventObject& rEvent ) throw (::com::sun::star::uno::RuntimeException) +void vcl::unohelper::DragAndDropWrapper::disposing( const ::com::sun::star::lang::EventObject& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // Empty Source means it's the client, because the client is not a XInterface if ( !rEvent.Source.is() ) @@ -121,69 +121,69 @@ void vcl::unohelper::DragAndDropWrapper::disposing( const ::com::sun::star::lang // ::com::sun::star::datatransfer::dnd::XDragGestureListener -void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException) +void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragGestureRecognized( rDGE ); } // ::com::sun::star::datatransfer::dnd::XDragSourceListener -void vcl::unohelper::DragAndDropWrapper::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (::com::sun::star::uno::RuntimeException) +void vcl::unohelper::DragAndDropWrapper::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragDropEnd( rDSDE ); } -void vcl::unohelper::DragAndDropWrapper::dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException) +void vcl::unohelper::DragAndDropWrapper::dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragEnter( dsde ); } -void vcl::unohelper::DragAndDropWrapper::dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw (::com::sun::star::uno::RuntimeException) +void vcl::unohelper::DragAndDropWrapper::dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragExit( dse ); } -void vcl::unohelper::DragAndDropWrapper::dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException) +void vcl::unohelper::DragAndDropWrapper::dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragOver( dsde ); } -void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException) +void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dropActionChanged( dsde ); } // ::com::sun::star::datatransfer::dnd::XDropTargetListener -void vcl::unohelper::DragAndDropWrapper::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException) +void vcl::unohelper::DragAndDropWrapper::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->drop( rDTDE ); } -void vcl::unohelper::DragAndDropWrapper::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (::com::sun::star::uno::RuntimeException) +void vcl::unohelper::DragAndDropWrapper::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragEnter( rDTDEE ); } -void vcl::unohelper::DragAndDropWrapper::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException) +void vcl::unohelper::DragAndDropWrapper::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragExit( dte ); } -void vcl::unohelper::DragAndDropWrapper::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException) +void vcl::unohelper::DragAndDropWrapper::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dragOver( rDTDE ); } -void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException) +void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( mpClient ) mpClient->dropActionChanged( rDTDE ); diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 8f1ab9e9f8a3..b16b5443d942 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -75,12 +75,12 @@ class VCLSession: virtual ~VCLSession() {} - virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException ); - virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) throw( RuntimeException ); - virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException ); - virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException ); - virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException ); - virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException ); + virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ); + virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ); + virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ); + virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ); + virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException, std::exception ); void callSaveRequested( bool bShutdown, bool bCancelable ); void callShutdownCancelled(); @@ -233,14 +233,14 @@ void VCLSession::SalSessionEventProc( void* pData, SalSessionEvent* pEvent ) } } -void SAL_CALL VCLSession::addSessionManagerListener( const css::uno::Reference<XSessionManagerListener>& xListener ) throw( RuntimeException ) +void SAL_CALL VCLSession::addSessionManagerListener( const css::uno::Reference<XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( *this ); m_aListeners.push_back( Listener( xListener ) ); } -void SAL_CALL VCLSession::removeSessionManagerListener( const css::uno::Reference<XSessionManagerListener>& xListener ) throw( RuntimeException ) +void SAL_CALL VCLSession::removeSessionManagerListener( const css::uno::Reference<XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( *this ); @@ -256,7 +256,7 @@ void SAL_CALL VCLSession::removeSessionManagerListener( const css::uno::Referenc } } -void SAL_CALL VCLSession::queryInteraction( const css::uno::Reference<XSessionManagerListener>& xListener ) throw( RuntimeException ) +void SAL_CALL VCLSession::queryInteraction( const css::uno::Reference<XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ) { if( m_bInteractionGranted ) { @@ -283,7 +283,7 @@ void SAL_CALL VCLSession::queryInteraction( const css::uno::Reference<XSessionMa } } -void SAL_CALL VCLSession::interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException ) +void SAL_CALL VCLSession::interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( *this ); int nRequested = 0, nDone = 0; @@ -306,7 +306,7 @@ void SAL_CALL VCLSession::interactionDone( const css::uno::Reference< XSessionMa } } -void SAL_CALL VCLSession::saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException ) +void SAL_CALL VCLSession::saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( *this ); @@ -327,7 +327,7 @@ void SAL_CALL VCLSession::saveDone( const css::uno::Reference< XSessionManagerLi } } -sal_Bool SAL_CALL VCLSession::cancelShutdown() throw( RuntimeException ) +sal_Bool SAL_CALL VCLSession::cancelShutdown() throw( RuntimeException, std::exception ) { return m_pSession && m_pSession->cancelShutdown(); } diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 5fce326532b4..10430142580c 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -244,13 +244,13 @@ public: // XCurrentContext virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_prevContext; }; com::sun::star::uno::Any AccessBridgeCurrentContext::getValueByName( const OUString & Name ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { com::sun::star::uno::Any ret; if ( Name == "java-vm.interaction-handler" ) diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 6d6cecfc9da1..65ca649eb968 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -212,13 +212,13 @@ public: // XCurrentContext virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_xNextContext; }; -uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Name) throw (uno::RuntimeException) +uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Name) throw (uno::RuntimeException, std::exception) { uno::Any retVal; @@ -329,12 +329,12 @@ namespace */ class VCLUnoWrapperDeleter : public cppu::WeakImplHelper1<com::sun::star::lang::XEventListener> { - virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException); + virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception); }; void VCLUnoWrapperDeleter::disposing(lang::EventObject const& /* rSource */) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ImplSVData* const pSVData = ImplGetSVData(); if (pSVData && pSVData->mpUnoWrapper) diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index ae2929afc597..ccaa289219c2 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -63,14 +63,14 @@ namespace vcl { namespace unohelper { } // ::com::sun::star::uno::XInterface - uno::Any TextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) + uno::Any TextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< datatransfer::XTransferable* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } // ::com::sun::star::datatransfer::XTransferable - uno::Any TextDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor ) throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException) + uno::Any TextDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor ) throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception) { uno::Any aAny; @@ -86,14 +86,14 @@ namespace vcl { namespace unohelper { return aAny; } - uno::Sequence< datatransfer::DataFlavor > TextDataObject::getTransferDataFlavors( ) throw(uno::RuntimeException) + uno::Sequence< datatransfer::DataFlavor > TextDataObject::getTransferDataFlavors( ) throw(uno::RuntimeException, std::exception) { uno::Sequence< datatransfer::DataFlavor > aDataFlavors(1); SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aDataFlavors.getArray()[0] ); return aDataFlavors; } - sal_Bool TextDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor ) throw(uno::RuntimeException) + sal_Bool TextDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor ) throw(uno::RuntimeException, std::exception) { sal_uLong nT = SotExchange::GetFormat( rFlavor ); return ( nT == SOT_FORMAT_STRING ); diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 5fa2a1680a59..c25668126900 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -78,9 +78,9 @@ public: * XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException ); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ); static OUString getImplementationName_static(); static Sequence< OUString > getSupportedServiceNames_static(); @@ -90,33 +90,33 @@ public: */ virtual Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() - throw(RuntimeException); + throw(RuntimeException, std::exception); virtual void SAL_CALL setContents( const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw(RuntimeException); + throw(RuntimeException, std::exception); virtual OUString SAL_CALL getName() - throw(RuntimeException); + throw(RuntimeException, std::exception); /* * XClipboardEx */ virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw(RuntimeException); + throw(RuntimeException, std::exception); /* * XClipboardNotifier */ virtual void SAL_CALL addClipboardListener( const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException); + throw(RuntimeException, std::exception); virtual void SAL_CALL removeClipboardListener( const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException); + throw(RuntimeException, std::exception); }; GenericClipboard::~GenericClipboard() @@ -135,22 +135,22 @@ Sequence< OUString > GenericClipboard::getSupportedServiceNames_static() return aRet; } -OUString GenericClipboard::getImplementationName() throw( RuntimeException ) +OUString GenericClipboard::getImplementationName() throw( RuntimeException, std::exception ) { return getImplementationName_static(); } -Sequence< OUString > GenericClipboard::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > GenericClipboard::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return getSupportedServiceNames_static(); } -sal_Bool GenericClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException ) +sal_Bool GenericClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } -Reference< ::com::sun::star::datatransfer::XTransferable > GenericClipboard::getContents() throw( RuntimeException ) +Reference< ::com::sun::star::datatransfer::XTransferable > GenericClipboard::getContents() throw( RuntimeException, std::exception ) { return m_aContents; } @@ -158,7 +158,7 @@ Reference< ::com::sun::star::datatransfer::XTransferable > GenericClipboard::get void GenericClipboard::setContents( const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); Reference< datatransfer::clipboard::XClipboardOwner > xOldOwner( m_aOwner ); @@ -181,18 +181,18 @@ void GenericClipboard::setContents( } } -OUString GenericClipboard::getName() throw( RuntimeException ) +OUString GenericClipboard::getName() throw( RuntimeException, std::exception ) { return OUString( "CLIPBOARD" ); } -sal_Int8 GenericClipboard::getRenderingCapabilities() throw( RuntimeException ) +sal_Int8 GenericClipboard::getRenderingCapabilities() throw( RuntimeException, std::exception ) { return 0; } void GenericClipboard::addClipboardListener( const Reference< datatransfer::clipboard::XClipboardListener >& listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -200,7 +200,7 @@ void GenericClipboard::addClipboardListener( const Reference< datatransfer::clip } void GenericClipboard::removeClipboardListener( const Reference< datatransfer::clipboard::XClipboardListener >& listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -221,8 +221,8 @@ public: /* * XSingleServiceFactory */ - virtual Reference< XInterface > SAL_CALL createInstance() throw(); - virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(); + virtual Reference< XInterface > SAL_CALL createInstance() throw(std::exception); + virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(std::exception); }; @@ -242,14 +242,14 @@ ClipboardFactory::~ClipboardFactory() -Reference< XInterface > ClipboardFactory::createInstance() throw() +Reference< XInterface > ClipboardFactory::createInstance() throw(std::exception) { return createInstanceWithArguments( Sequence< Any >() ); } -Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Sequence< Any >& arguments ) throw() +Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Sequence< Any >& arguments ) throw(std::exception) { SolarMutexGuard aGuard; Reference< XInterface > xResult = ImplGetSVData()->mpDefInst->CreateClipboard( arguments ); @@ -290,17 +290,17 @@ public: virtual ~GenericDragSource(); // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported() throw(); - virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(); + virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception); + virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception); virtual void SAL_CALL startDrag( const datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const Reference< datatransfer::XTransferable >& transferable, const Reference< datatransfer::dnd::XDragSourceListener >& listener - ) throw(); + ) throw(std::exception); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception ); + virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ); static Sequence< OUString > getSupportedServiceNames_static() { @@ -319,12 +319,12 @@ GenericDragSource::~GenericDragSource() { } -sal_Bool GenericDragSource::isDragImageSupported() throw() +sal_Bool GenericDragSource::isDragImageSupported() throw(std::exception) { return sal_False; } -sal_Int32 GenericDragSource::getDefaultCursor( sal_Int8 ) throw() +sal_Int32 GenericDragSource::getDefaultCursor( sal_Int8 ) throw(std::exception) { return 0; } @@ -333,7 +333,7 @@ void GenericDragSource::startDrag( const datatransfer::dnd::DragGestureEvent&, sal_Int8 /*sourceActions*/, sal_Int32 /*cursor*/, sal_Int32 /*image*/, const Reference< datatransfer::XTransferable >&, const Reference< datatransfer::dnd::XDragSourceListener >& listener - ) throw() + ) throw(std::exception) { datatransfer::dnd::DragSourceDropEvent aEv; aEv.DropAction = datatransfer::dnd::DNDConstants::ACTION_COPY; @@ -341,7 +341,7 @@ void GenericDragSource::startDrag( const datatransfer::dnd::DragGestureEvent&, listener->dragDropEnd( aEv ); } -void GenericDragSource::initialize( const Sequence< Any >& ) throw( Exception ) +void GenericDragSource::initialize( const Sequence< Any >& ) throw( Exception, std::exception ) { } @@ -403,15 +403,15 @@ public: virtual ~GenericDropTarget(); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception ); + virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception, std::exception ); // XDropTarget - virtual void SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(); - virtual void SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(); - virtual sal_Bool SAL_CALL isActive() throw(); - virtual void SAL_CALL setActive( sal_Bool active ) throw(); - virtual sal_Int8 SAL_CALL getDefaultActions() throw(); - virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(); + virtual void SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception); + virtual void SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception); + virtual sal_Bool SAL_CALL isActive() throw(std::exception); + virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception); + virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception); + virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception); static Sequence< OUString > getSupportedServiceNames_static() { @@ -430,33 +430,33 @@ GenericDropTarget::~GenericDropTarget() { } -void GenericDropTarget::initialize( const Sequence< Any >& ) throw( Exception ) +void GenericDropTarget::initialize( const Sequence< Any >& ) throw( Exception, std::exception ) { } -void GenericDropTarget::addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw() +void GenericDropTarget::addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) { } -void GenericDropTarget::removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw() +void GenericDropTarget::removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) { } -sal_Bool GenericDropTarget::isActive() throw() +sal_Bool GenericDropTarget::isActive() throw(std::exception) { return sal_False; } -void GenericDropTarget::setActive( sal_Bool ) throw() +void GenericDropTarget::setActive( sal_Bool ) throw(std::exception) { } -sal_Int8 GenericDropTarget::getDefaultActions() throw() +sal_Int8 GenericDropTarget::getDefaultActions() throw(std::exception) { return 0; } -void GenericDropTarget::setDefaultActions( sal_Int8) throw() +void GenericDropTarget::setDefaultActions( sal_Int8) throw(std::exception) { } diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index 572051d65d12..82254081e9e0 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -55,15 +55,15 @@ FontIdentificator() {} // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& ) throw (Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& ) throw (Exception, RuntimeException, std::exception); // XMaterialHolder - virtual Any SAL_CALL getMaterial() throw(RuntimeException); + virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception); }; @@ -73,7 +73,7 @@ FontIdentificator::~FontIdentificator() { } -void SAL_CALL FontIdentificator::initialize( const Sequence<Any>& i_rArgs ) throw(Exception,RuntimeException) +void SAL_CALL FontIdentificator::initialize( const Sequence<Any>& i_rArgs ) throw(Exception,RuntimeException, std::exception) { if( !ImplGetSVData() ) return; // VCL not initialized @@ -91,7 +91,7 @@ void SAL_CALL FontIdentificator::initialize( const Sequence<Any>& i_rArgs ) thro } } -Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException) +Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException, std::exception) { if( !ImplGetSVData() ) return Any(); // VCL not initialized @@ -174,17 +174,17 @@ Reference< XInterface > SAL_CALL FontIdentificator_createInstance( const Referen } // XServiceInfo -OUString SAL_CALL FontIdentificator::getImplementationName() throw (RuntimeException) +OUString SAL_CALL FontIdentificator::getImplementationName() throw (RuntimeException, std::exception) { return FontIdentificator_getImplementationName(); } -sal_Bool SAL_CALL FontIdentificator::supportsService( const OUString& i_rServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL FontIdentificator::supportsService( const OUString& i_rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, i_rServiceName); } -Sequence< OUString > SAL_CALL FontIdentificator::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > SAL_CALL FontIdentificator::getSupportedServiceNames() throw (RuntimeException, std::exception) { return FontIdentificator_getSupportedServiceNames(); } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 69af9da71d8e..a3af7ecf7f5e 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -3013,7 +3013,7 @@ void Edit::DeletePopupMenu( PopupMenu* pMenu ) } // ::com::sun::star::datatransfer::dnd::XDragGestureListener -void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException) +void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -3051,7 +3051,7 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra } // ::com::sun::star::datatransfer::dnd::XDragSourceListener -void Edit::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (::com::sun::star::uno::RuntimeException) +void Edit::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -3077,7 +3077,7 @@ void Edit::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDro } // ::com::sun::star::datatransfer::dnd::XDropTargetListener -void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException) +void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -3124,7 +3124,7 @@ void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE.Context->dropComplete( bChanges ); } -void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException) +void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( !mpDDInfo ) { @@ -3146,14 +3146,14 @@ void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragE } } -void Edit::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& ) throw (::com::sun::star::uno::RuntimeException) +void Edit::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; ImplHideDDCursor(); } -void Edit::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException) +void Edit::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 6a8c268a1a4e..d8b26df1a8e7 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -75,14 +75,14 @@ public: SvMemoryStream& GetHTMLStream() { return maHTMLStream; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL acquire() throw() { OWeakObject::acquire(); } void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::datatransfer::XTransferable - ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; TETextDataObject::TETextDataObject( const OUString& rText ) : maText( rText ) @@ -94,14 +94,14 @@ TETextDataObject::~TETextDataObject() } // uno::XInterface -uno::Any TETextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any TETextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< datatransfer::XTransferable* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } // datatransfer::XTransferable -uno::Any TETextDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor ) throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException) +uno::Any TETextDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor ) throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception) { uno::Any aAny; @@ -127,7 +127,7 @@ uno::Any TETextDataObject::getTransferData( const datatransfer::DataFlavor& rFla return aAny; } -uno::Sequence< datatransfer::DataFlavor > TETextDataObject::getTransferDataFlavors( ) throw(uno::RuntimeException) +uno::Sequence< datatransfer::DataFlavor > TETextDataObject::getTransferDataFlavors( ) throw(uno::RuntimeException, std::exception) { GetHTMLStream().Seek( STREAM_SEEK_TO_END ); bool bHTML = GetHTMLStream().Tell() > 0; @@ -138,7 +138,7 @@ uno::Sequence< datatransfer::DataFlavor > TETextDataObject::getTransferDataFlavo return aDataFlavors; } -sal_Bool TETextDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor ) throw(uno::RuntimeException) +sal_Bool TETextDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor ) throw(uno::RuntimeException, std::exception) { sal_uLong nT = SotExchange::GetFormat( rFlavor ); return ( nT == SOT_FORMAT_STRING ); @@ -1986,7 +1986,7 @@ bool TextView::ImplCheckTextLen( const OUString& rNewText ) return bOK; } -void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException) +void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( mpImpl->mbClickedInSelection ) { @@ -2034,14 +2034,14 @@ void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd: } } -void TextView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& ) throw (::com::sun::star::uno::RuntimeException) +void TextView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ImpHideDDCursor(); delete mpImpl->mpDDInfo; mpImpl->mpDDInfo = NULL; } -void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException) +void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -2152,17 +2152,17 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv rDTDE.Context->dropComplete( bChanges ); } -void TextView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& ) throw (::com::sun::star::uno::RuntimeException) +void TextView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { } -void TextView::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& ) throw (::com::sun::star::uno::RuntimeException) +void TextView::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; ImpHideDDCursor(); } -void TextView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException) +void TextView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index ded84a24c523..f37eb65307a3 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -94,12 +94,12 @@ protected: SvStream& mrStm; virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& rData ) - throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException) + throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) { mrStm.Write( rData.getConstArray(), rData.getLength() ); } virtual void SAL_CALL flush() - throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException) + throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) { mrStm.Flush(); } - virtual void SAL_CALL closeOutput() throw() {} + virtual void SAL_CALL closeOutput() throw(std::exception) {} public: diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 36b5c69c0ebe..681c75448c39 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -6830,9 +6830,9 @@ class PDFStreamIf : PDFStreamIf( PDFWriterImpl* pWriter ) : m_pWriter( pWriter ), m_bWrite( true ) {} virtual ~PDFStreamIf(); - virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(); - virtual void SAL_CALL flush() throw(); - virtual void SAL_CALL closeOutput() throw(); + virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(std::exception); + virtual void SAL_CALL flush() throw(std::exception); + virtual void SAL_CALL closeOutput() throw(std::exception); }; } @@ -6840,7 +6840,7 @@ PDFStreamIf::~PDFStreamIf() { } -void SAL_CALL PDFStreamIf::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw() +void SAL_CALL PDFStreamIf::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) { if( m_bWrite && aData.getLength() ) { @@ -6849,11 +6849,11 @@ void SAL_CALL PDFStreamIf::writeBytes( const com::sun::star::uno::Sequence< sal } } -void SAL_CALL PDFStreamIf::flush() throw() +void SAL_CALL PDFStreamIf::flush() throw(std::exception) { } -void SAL_CALL PDFStreamIf::closeOutput() throw() +void SAL_CALL PDFStreamIf::closeOutput() throw(std::exception) { m_bWrite = false; } diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 5d632fcd02ba..b0410fec3d65 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -1113,7 +1113,7 @@ public: } // XMaterialHolder - virtual uno::Any SAL_CALL getMaterial() throw() + virtual uno::Any SAL_CALL getMaterial() throw(std::exception) { return uno::makeAny( sal_Int64(maID) ); } diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 118f3066aa83..ee9d63ce1071 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -432,20 +432,20 @@ VclCanvasBitmap::~VclCanvasBitmap() } // XBitmap -geometry::IntegerSize2D SAL_CALL VclCanvasBitmap::getSize() throw (uno::RuntimeException) +geometry::IntegerSize2D SAL_CALL VclCanvasBitmap::getSize() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return integerSize2DFromSize( m_aBitmap.GetSizePixel() ); } -::sal_Bool SAL_CALL VclCanvasBitmap::hasAlpha() throw (uno::RuntimeException) +::sal_Bool SAL_CALL VclCanvasBitmap::hasAlpha() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return m_aBmpEx.IsTransparent(); } uno::Reference< rendering::XBitmap > SAL_CALL VclCanvasBitmap::getScaledBitmap( const geometry::RealSize2D& newSize, - sal_Bool beFast ) throw (uno::RuntimeException) + sal_Bool beFast ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -458,7 +458,7 @@ uno::Reference< rendering::XBitmap > SAL_CALL VclCanvasBitmap::getScaledBitmap( uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getData( rendering::IntegerBitmapLayout& bitmapLayout, const geometry::IntegerRectangle2D& rect ) throw( lang::IndexOutOfBoundsException, rendering::VolatileContentDestroyedException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -563,7 +563,7 @@ uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getData( rendering::IntegerB uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getPixel( rendering::IntegerBitmapLayout& bitmapLayout, const geometry::IntegerPoint2D& pos ) throw (lang::IndexOutOfBoundsException, rendering::VolatileContentDestroyedException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -640,7 +640,7 @@ uno::Reference< rendering::XBitmapPalette > SAL_CALL VclCanvasBitmap::getPalette return aRet; } -rendering::IntegerBitmapLayout SAL_CALL VclCanvasBitmap::getMemoryLayout() throw (uno::RuntimeException) +rendering::IntegerBitmapLayout SAL_CALL VclCanvasBitmap::getMemoryLayout() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -657,7 +657,7 @@ rendering::IntegerBitmapLayout SAL_CALL VclCanvasBitmap::getMemoryLayout() throw return aLayout; } -sal_Int32 SAL_CALL VclCanvasBitmap::getNumberOfEntries() throw (uno::RuntimeException) +sal_Int32 SAL_CALL VclCanvasBitmap::getNumberOfEntries() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -667,7 +667,7 @@ sal_Int32 SAL_CALL VclCanvasBitmap::getNumberOfEntries() throw (uno::RuntimeExce return m_pBmpAcc->HasPalette() ? m_pBmpAcc->GetPaletteEntryCount() : 0 ; } -sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -688,7 +688,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, s return sal_True; // no palette transparency here. } -sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal_Bool, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException) +sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal_Bool, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -715,36 +715,36 @@ namespace }; } -uno::Reference< rendering::XColorSpace > SAL_CALL VclCanvasBitmap::getColorSpace( ) throw (uno::RuntimeException) +uno::Reference< rendering::XColorSpace > SAL_CALL VclCanvasBitmap::getColorSpace( ) throw (uno::RuntimeException, std::exception) { // this is the method from XBitmapPalette. Return palette color // space here return PaletteColorSpaceHolder::get(); } -sal_Int8 SAL_CALL VclCanvasBitmap::getType( ) throw (uno::RuntimeException) +sal_Int8 SAL_CALL VclCanvasBitmap::getType( ) throw (uno::RuntimeException, std::exception) { return rendering::ColorSpaceType::RGB; } -uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::getComponentTags( ) throw (uno::RuntimeException) +uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::getComponentTags( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return m_aComponentTags; } -sal_Int8 SAL_CALL VclCanvasBitmap::getRenderingIntent( ) throw (uno::RuntimeException) +sal_Int8 SAL_CALL VclCanvasBitmap::getRenderingIntent( ) throw (uno::RuntimeException, std::exception) { return rendering::RenderingIntent::PERCEPTUAL; } -uno::Sequence< ::beans::PropertyValue > SAL_CALL VclCanvasBitmap::getProperties( ) throw (uno::RuntimeException) +uno::Sequence< ::beans::PropertyValue > SAL_CALL VclCanvasBitmap::getProperties( ) throw (uno::RuntimeException, std::exception) { return uno::Sequence< ::beans::PropertyValue >(); } uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertColorSpace( const uno::Sequence< double >& deviceColor, - const uno::Reference< ::rendering::XColorSpace >& targetColorSpace ) throw (uno::RuntimeException) + const uno::Reference< ::rendering::XColorSpace >& targetColorSpace ) throw (uno::RuntimeException, std::exception) { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -753,7 +753,7 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertColorSpace( const uno:: return targetColorSpace->convertFromARGB(aIntermediate); } -uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException) +uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -802,7 +802,7 @@ uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertToRGB( const return aRes; } -uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException) +uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -855,7 +855,7 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToARGB( con return aRes; } -uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException) +uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -908,7 +908,7 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToPARGB( co return aRes; } -uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromRGB( const uno::Sequence<rendering::RGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException) +uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromRGB( const uno::Sequence<rendering::RGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -948,7 +948,7 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromRGB( const uno::Seq return aRes; } -uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException) +uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -988,7 +988,7 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromARGB( const uno::Se return aRes; } -uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromPARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException) +uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromPARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1030,26 +1030,26 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromPARGB( const uno::S return aRes; } -sal_Int32 SAL_CALL VclCanvasBitmap::getBitsPerPixel( ) throw (uno::RuntimeException) +sal_Int32 SAL_CALL VclCanvasBitmap::getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return m_nBitsPerOutputPixel; } -uno::Sequence< ::sal_Int32 > SAL_CALL VclCanvasBitmap::getComponentBitCounts( ) throw (uno::RuntimeException) +uno::Sequence< ::sal_Int32 > SAL_CALL VclCanvasBitmap::getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return m_aComponentBitCounts; } -sal_Int8 SAL_CALL VclCanvasBitmap::getEndianness( ) throw (uno::RuntimeException) +sal_Int8 SAL_CALL VclCanvasBitmap::getEndianness( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return m_nEndianness; } uno::Sequence<double> SAL_CALL VclCanvasBitmap::convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< ::rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,uno::RuntimeException) + const uno::Reference< ::rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { if( dynamic_cast<VclCanvasBitmap*>(targetColorSpace.get()) ) { @@ -1113,7 +1113,7 @@ uno::Sequence<double> SAL_CALL VclCanvasBitmap::convertFromIntegerColorSpace( co } uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< ::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,uno::RuntimeException) + const uno::Reference< ::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { if( dynamic_cast<VclCanvasBitmap*>(targetColorSpace.get()) ) { @@ -1130,7 +1130,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertToIntegerColorSpace } } -uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException) +uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1182,7 +1182,7 @@ uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToRGB return aRes; } -uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException) +uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1237,7 +1237,7 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToAR return aRes; } -uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException) +uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1293,7 +1293,7 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToPA return aRes; } -uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromRGB( const uno::Sequence<rendering::RGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException) +uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromRGB( const uno::Sequence<rendering::RGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1342,7 +1342,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromRGB( con return aRes; } -uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException) +uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1391,7 +1391,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromARGB( co return aRes; } -uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromPARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException) +uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromPARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 6900f70dc93a..2ad6a542c611 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -428,25 +428,25 @@ namespace vcl private: uno::Sequence< sal_Int8 > m_aComponentTags; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) { return m_aComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException) + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) { return uno::Sequence< beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -454,7 +454,7 @@ namespace vcl convertToARGB(deviceColor)); return targetColorSpace->convertFromARGB(aIntermediate); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -471,7 +471,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -488,7 +488,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -505,7 +505,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -522,7 +522,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -539,7 +539,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx index 887060fb2269..2a91d59ebbec 100644 --- a/vcl/source/helper/xconnection.cxx +++ b/vcl/source/helper/xconnection.cxx @@ -73,35 +73,35 @@ void DisplayConnection::terminate() (*it)->handleEvent( aEvent ); } -void SAL_CALL DisplayConnection::addEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler, sal_Int32 /*eventMask*/ ) throw() +void SAL_CALL DisplayConnection::addEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler, sal_Int32 /*eventMask*/ ) throw(std::exception) { MutexGuard aGuard( m_aMutex ); m_aHandlers.push_back( handler ); } -void SAL_CALL DisplayConnection::removeEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler ) throw() +void SAL_CALL DisplayConnection::removeEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler ) throw(std::exception) { MutexGuard aGuard( m_aMutex ); m_aHandlers.remove( handler ); } -void SAL_CALL DisplayConnection::addErrorHandler( const css::uno::Reference< XEventHandler >& handler ) throw() +void SAL_CALL DisplayConnection::addErrorHandler( const css::uno::Reference< XEventHandler >& handler ) throw(std::exception) { MutexGuard aGuard( m_aMutex ); m_aErrorHandlers.push_back( handler ); } -void SAL_CALL DisplayConnection::removeErrorHandler( const css::uno::Reference< XEventHandler >& handler ) throw() +void SAL_CALL DisplayConnection::removeErrorHandler( const css::uno::Reference< XEventHandler >& handler ) throw(std::exception) { MutexGuard aGuard( m_aMutex ); m_aErrorHandlers.remove( handler ); } -Any SAL_CALL DisplayConnection::getIdentifier() throw() +Any SAL_CALL DisplayConnection::getIdentifier() throw(std::exception) { return m_aAny; } diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx index 49ca76f28e1f..0e433ec165e4 100644 --- a/vcl/source/window/dndevdis.cxx +++ b/vcl/source/window/dndevdis.cxx @@ -81,7 +81,7 @@ Window* DNDEventDispatcher::findTopLevelWindow(Point location) void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aImplGuard( m_aMutex ); @@ -121,7 +121,7 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtdee ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aImplGuard( m_aMutex ); Point location( dtdee.LocationX, dtdee.LocationY ); @@ -149,7 +149,7 @@ void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtd void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aImplGuard( m_aMutex ); @@ -165,7 +165,7 @@ void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ ) void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aImplGuard( m_aMutex ); @@ -206,7 +206,7 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& dtde ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aImplGuard( m_aMutex ); @@ -248,7 +248,7 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& dge ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aImplGuard( m_aMutex ); @@ -264,7 +264,7 @@ void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& void SAL_CALL DNDEventDispatcher::disposing( const EventObject& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { } @@ -272,7 +272,7 @@ void SAL_CALL DNDEventDispatcher::disposing( const EventObject& ) // DNDEventDispatcher::acceptDrag -void SAL_CALL DNDEventDispatcher::acceptDrag( sal_Int8 /*dropAction*/ ) throw(RuntimeException) +void SAL_CALL DNDEventDispatcher::acceptDrag( sal_Int8 /*dropAction*/ ) throw(RuntimeException, std::exception) { } @@ -280,7 +280,7 @@ void SAL_CALL DNDEventDispatcher::acceptDrag( sal_Int8 /*dropAction*/ ) throw(Ru // DNDEventDispatcher::rejectDrag -void SAL_CALL DNDEventDispatcher::rejectDrag() throw(RuntimeException) +void SAL_CALL DNDEventDispatcher::rejectDrag() throw(RuntimeException, std::exception) { } diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx index b6a4ecef0782..fee57ec8cb79 100644 --- a/vcl/source/window/dndlcon.cxx +++ b/vcl/source/window/dndlcon.cxx @@ -49,7 +49,7 @@ DNDListenerContainer::~DNDListenerContainer() void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDragGestureListener >& dgl ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { rBHelper.addListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl ); } @@ -59,7 +59,7 @@ void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDr void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< XDragGestureListener >& dgl ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { rBHelper.removeListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl ); } @@ -69,7 +69,7 @@ void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< void SAL_CALL DNDListenerContainer::resetRecognizer( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { } @@ -78,7 +78,7 @@ void SAL_CALL DNDListenerContainer::resetRecognizer( ) void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDropTargetListener >& dtl ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { rBHelper.addListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl ); } @@ -88,7 +88,7 @@ void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDro void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< XDropTargetListener >& dtl ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { rBHelper.removeListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl ); } @@ -98,7 +98,7 @@ void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< X sal_Bool SAL_CALL DNDListenerContainer::isActive( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return m_bActive; } @@ -108,7 +108,7 @@ sal_Bool SAL_CALL DNDListenerContainer::isActive( ) void SAL_CALL DNDListenerContainer::setActive( sal_Bool active ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { m_bActive = active; } @@ -118,7 +118,7 @@ void SAL_CALL DNDListenerContainer::setActive( sal_Bool active ) sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return m_nDefaultActions; } @@ -128,7 +128,7 @@ sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions( ) void SAL_CALL DNDListenerContainer::setDefaultActions( sal_Int8 actions ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { m_nDefaultActions = actions; } @@ -496,7 +496,7 @@ sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_ // DNDListenerContainer::acceptDrag -void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw (RuntimeException) +void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw (RuntimeException, std::exception) { if( m_xDropTargetDragContext.is() ) { @@ -509,7 +509,7 @@ void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw ( // DNDListenerContainer::rejectDrag -void SAL_CALL DNDListenerContainer::rejectDrag( ) throw (RuntimeException) +void SAL_CALL DNDListenerContainer::rejectDrag( ) throw (RuntimeException, std::exception) { // nothing to do here } @@ -518,7 +518,7 @@ void SAL_CALL DNDListenerContainer::rejectDrag( ) throw (RuntimeException) // DNDListenerContainer::acceptDrop -void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation ) throw (RuntimeException) +void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation ) throw (RuntimeException, std::exception) { if( m_xDropTargetDropContext.is() ) m_xDropTargetDropContext->acceptDrop( dropOperation ); @@ -528,7 +528,7 @@ void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation ) throw ( // DNDListenerContainer::rejectDrop -void SAL_CALL DNDListenerContainer::rejectDrop( ) throw (RuntimeException) +void SAL_CALL DNDListenerContainer::rejectDrop( ) throw (RuntimeException, std::exception) { // nothing to do here } @@ -537,7 +537,7 @@ void SAL_CALL DNDListenerContainer::rejectDrop( ) throw (RuntimeException) // DNDListenerContainer::dropComplete -void SAL_CALL DNDListenerContainer::dropComplete( sal_Bool success ) throw (RuntimeException) +void SAL_CALL DNDListenerContainer::dropComplete( sal_Bool success ) throw (RuntimeException, std::exception) { if( m_xDropTargetDropContext.is() ) { |