diff options
Diffstat (limited to 'vcl')
58 files changed, 629 insertions, 629 deletions
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index 3187dc9bd31a..6bd3bd9ac984 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -63,45 +63,45 @@ namespace unotools public: // XBitmap - virtual com::sun::star::geometry::IntegerSize2D SAL_CALL getSize() throw (com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasAlpha( ) throw (::com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Reference< com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const com::sun::star::geometry::RealSize2D& newSize, sal_Bool beFast ) throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::geometry::IntegerSize2D SAL_CALL getSize() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasAlpha( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Reference< com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const com::sun::star::geometry::RealSize2D& newSize, sal_Bool beFast ) throw (com::sun::star::uno::RuntimeException, std::exception); // XIntegerReadOnlyBitmap - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XBitmapPalette - virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getIndex( ::com::sun::star::uno::Sequence< double >& entry, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL setIndex( const ::com::sun::star::uno::Sequence< double >& color, ::sal_Bool transparency, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getIndex( ::com::sun::star::uno::Sequence< double >& entry, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL setIndex( const ::com::sun::star::uno::Sequence< double >& color, ::sal_Bool transparency, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XIntegerBitmapColorSpace - virtual ::sal_Int8 SAL_CALL getType( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertColorSpace( const ::com::sun::star::uno::Sequence< double >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertToRGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToPARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Int8 SAL_CALL getType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertColorSpace( const ::com::sun::star::uno::Sequence< double >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertToRGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToPARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); /** Create API wrapper for given BitmapEx diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx index c00878d3479b..5b6b12089560 100644 --- a/vcl/inc/dndevdis.hxx +++ b/vcl/inc/dndevdis.hxx @@ -71,31 +71,31 @@ public: * XDropTargetDragContext */ - virtual void SAL_CALL acceptDrag( sal_Int8 dropAction ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rejectDrag() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acceptDrag( sal_Int8 dropAction ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rejectDrag() throw(::com::sun::star::uno::RuntimeException, std::exception); /* * XDropTargetListener */ - virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception); /* * XDragGestureListener */ - virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw(::com::sun::star::uno::RuntimeException, std::exception); /* * XEventListener */ - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx index ff61207d3b13..3828ea0d66ca 100644 --- a/vcl/inc/dndlcon.hxx +++ b/vcl/inc/dndlcon.hxx @@ -76,36 +76,36 @@ public: * XDragGestureRecognizer */ - virtual void SAL_CALL addDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL resetRecognizer( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL resetRecognizer( ) throw(::com::sun::star::uno::RuntimeException, std::exception); /* * XDropTargetDragContext */ - virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rejectDrag( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rejectDrag( ) throw (::com::sun::star::uno::RuntimeException, std::exception); /* * XDropTargetDropContext */ - virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rejectDrop( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL dropComplete( sal_Bool success ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rejectDrop( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dropComplete( sal_Bool success ) throw (::com::sun::star::uno::RuntimeException, std::exception); /* * XDropTarget */ - virtual void SAL_CALL addDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isActive( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActive( sal_Bool active ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int8 SAL_CALL getDefaultActions( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isActive( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setActive( sal_Bool active ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int8 SAL_CALL getDefaultActions( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx index cc31ceadf414..7d1534583579 100644 --- a/vcl/inc/osx/a11ylistener.hxx +++ b/vcl/inc/osx/a11ylistener.hxx @@ -42,11 +42,11 @@ public: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleEventListener virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); private: const id m_wrapperObject; diff --git a/vcl/inc/xconnection.hxx b/vcl/inc/xconnection.hxx index c55639689613..d9042feb73d2 100644 --- a/vcl/inc/xconnection.hxx +++ b/vcl/inc/xconnection.hxx @@ -50,11 +50,11 @@ namespace vcl { virtual bool dispatchErrorEvent( void* pData, int nBytes ); // XDisplayConnection - virtual void SAL_CALL addEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw(); - virtual void SAL_CALL removeEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(); - virtual void SAL_CALL addErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(); - virtual void SAL_CALL removeErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(); - virtual ::com::sun::star::uno::Any SAL_CALL getIdentifier() throw(); + virtual void SAL_CALL addEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw(std::exception); + virtual void SAL_CALL removeEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception); + virtual void SAL_CALL addErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception); + virtual void SAL_CALL removeErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getIdentifier() throw(std::exception); }; diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx index 6c22424b51e0..10a0b80f0abd 100644 --- a/vcl/osx/DragSource.cxx +++ b/vcl/osx/DragSource.cxx @@ -165,7 +165,7 @@ DragSource::~DragSource() } void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments) - throw(Exception) + throw(Exception, std::exception) { if (aArguments.getLength() < 2) { @@ -210,13 +210,13 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments) } sal_Bool SAL_CALL DragSource::isDragImageSupported( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return true; } sal_Int32 SAL_CALL DragSource::getDefaultCursor( sal_Int8 /*dragAction*/ ) - throw( IllegalArgumentException, RuntimeException) + throw( IllegalArgumentException, RuntimeException, std::exception) { return 0; } @@ -227,7 +227,7 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger, sal_Int32 /*image*/, const uno::Reference<XTransferable >& transferable, const uno::Reference<XDragSourceListener >& listener ) - throw( RuntimeException) + throw( RuntimeException, std::exception) { MutexGuard guard(m_aMutex); @@ -327,17 +327,17 @@ unsigned int DragSource::getSupportedDragOperations(bool isLocal) const return srcActions; } -OUString SAL_CALL DragSource::getImplementationName( ) throw (RuntimeException) +OUString SAL_CALL DragSource::getImplementationName( ) throw (RuntimeException, std::exception) { return dragSource_getImplementationName(); } -sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames() throw (RuntimeException, std::exception) { return dragSource_getSupportedServiceNames(); } diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx index 625388e87a69..475cd70151f2 100644 --- a/vcl/osx/DragSource.hxx +++ b/vcl/osx/DragSource.hxx @@ -84,13 +84,13 @@ public: // XInitialization virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw(com::sun::star::uno::Exception/*, com::sun::star::uno::RuntimeException*/); + throw(com::sun::star::uno::Exception, std::exception/*, com::sun::star::uno::RuntimeException*/); // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported( ) throw(com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isDragImageSupported( ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getDefaultCursor(sal_Int8 dragAction) - throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException); + throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL startDrag( const com::sun::star::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, @@ -98,12 +98,12 @@ public: sal_Int32 image, const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& transferable, const com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDragSourceListener >& listener ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception); virtual void saveMouseEvent(NSEvent* theEvent); virtual unsigned int getSupportedDragOperations(bool isLocal) const; diff --git a/vcl/osx/DragSourceContext.cxx b/vcl/osx/DragSourceContext.cxx index 1eb4fe3ac78e..ff1e98069f2d 100644 --- a/vcl/osx/DragSourceContext.cxx +++ b/vcl/osx/DragSourceContext.cxx @@ -37,23 +37,23 @@ DragSourceContext::~DragSourceContext() } sal_Int32 SAL_CALL DragSourceContext::getCurrentCursor( ) - throw( RuntimeException) + throw( RuntimeException, std::exception) { return 0; } void SAL_CALL DragSourceContext::setCursor( sal_Int32 /*cursorId*/ ) - throw( RuntimeException) + throw( RuntimeException, std::exception) { } void SAL_CALL DragSourceContext::setImage( sal_Int32 /*imageId*/ ) - throw( RuntimeException) + throw( RuntimeException, std::exception) { } void SAL_CALL DragSourceContext::transferablesFlavorsChanged( ) - throw( RuntimeException) + throw( RuntimeException, std::exception) { } diff --git a/vcl/osx/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx index f27518ee2756..183dd6b54703 100644 --- a/vcl/osx/DragSourceContext.hxx +++ b/vcl/osx/DragSourceContext.hxx @@ -42,16 +42,16 @@ public: ~DragSourceContext(); virtual sal_Int32 SAL_CALL getCurrentCursor( ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setCursor( sal_Int32 cursorId ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setImage( sal_Int32 imageId ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL transferablesFlavorsChanged( ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); }; #endif // INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx index 7d9b29c4f61d..c7bb86ba8f02 100644 --- a/vcl/osx/DropTarget.cxx +++ b/vcl/osx/DropTarget.cxx @@ -345,7 +345,7 @@ void SAL_CALL DropTarget::disposing() } void SAL_CALL DropTarget::initialize(const Sequence< Any >& aArguments) - throw(Exception) + throw(Exception, std::exception) { if (aArguments.getLength() < 2) { @@ -377,59 +377,59 @@ void SAL_CALL DropTarget::initialize(const Sequence< Any >& aArguments) } void SAL_CALL DropTarget::addDropTargetListener(const uno::Reference<XDropTargetListener>& dtl) - throw(RuntimeException) + throw(RuntimeException, std::exception) { rBHelper.addListener(::getCppuType(&dtl), dtl); } void SAL_CALL DropTarget::removeDropTargetListener(const uno::Reference<XDropTargetListener>& dtl) - throw(RuntimeException) + throw(RuntimeException, std::exception) { rBHelper.removeListener(::getCppuType(&dtl), dtl); } -sal_Bool SAL_CALL DropTarget::isActive( ) throw(RuntimeException) +sal_Bool SAL_CALL DropTarget::isActive( ) throw(RuntimeException, std::exception) { return mbActive; } -void SAL_CALL DropTarget::setActive(sal_Bool active) throw(RuntimeException) +void SAL_CALL DropTarget::setActive(sal_Bool active) throw(RuntimeException, std::exception) { mbActive = active; } -sal_Int8 SAL_CALL DropTarget::getDefaultActions() throw(RuntimeException) +sal_Int8 SAL_CALL DropTarget::getDefaultActions() throw(RuntimeException, std::exception) { return mDefaultActions; } -void SAL_CALL DropTarget::setDefaultActions(sal_Int8 actions) throw(RuntimeException) +void SAL_CALL DropTarget::setDefaultActions(sal_Int8 actions) throw(RuntimeException, std::exception) { OSL_ENSURE( actions < 8, "No valid default actions"); mDefaultActions= actions; } -void SAL_CALL DropTarget::acceptDrag(sal_Int8 dragOperation) throw (RuntimeException) +void SAL_CALL DropTarget::acceptDrag(sal_Int8 dragOperation) throw (RuntimeException, std::exception) { mSelectedDropAction = dragOperation; } -void SAL_CALL DropTarget::rejectDrag() throw (RuntimeException) +void SAL_CALL DropTarget::rejectDrag() throw (RuntimeException, std::exception) { mSelectedDropAction = DNDConstants::ACTION_NONE; } -void SAL_CALL DropTarget::acceptDrop(sal_Int8 dropOperation) throw( RuntimeException) +void SAL_CALL DropTarget::acceptDrop(sal_Int8 dropOperation) throw( RuntimeException, std::exception) { mSelectedDropAction = dropOperation; } -void SAL_CALL DropTarget::rejectDrop() throw (RuntimeException) +void SAL_CALL DropTarget::rejectDrop() throw (RuntimeException, std::exception) { mSelectedDropAction = DNDConstants::ACTION_NONE; } -void SAL_CALL DropTarget::dropComplete(sal_Bool success) throw (RuntimeException) +void SAL_CALL DropTarget::dropComplete(sal_Bool success) throw (RuntimeException, std::exception) { // Reset the internal transferable used as shortcut in case this is // an internal D&D operation @@ -519,17 +519,17 @@ void DropTarget::fire_dropActionChanged(const DropTargetDragEvent& dtde) } } -OUString SAL_CALL DropTarget::getImplementationName() throw (RuntimeException) +OUString SAL_CALL DropTarget::getImplementationName() throw (RuntimeException, std::exception) { return dropTarget_getImplementationName(); } -sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return dropTarget_getSupportedServiceNames(); } diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx index 0eea030db18b..7e219305e068 100644 --- a/vcl/osx/DropTarget.hxx +++ b/vcl/osx/DropTarget.hxx @@ -93,34 +93,34 @@ public: // XInitialization virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw(com::sun::star::uno::Exception); + throw(com::sun::star::uno::Exception, std::exception); // XDropTarget virtual void SAL_CALL addDropTargetListener( const com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeDropTargetListener( const com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); // Default is not active - virtual sal_Bool SAL_CALL isActive() throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActive(sal_Bool isActive) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int8 SAL_CALL getDefaultActions() throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultActions(sal_Int8 actions) throw(com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isActive() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setActive(sal_Bool isActive) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int8 SAL_CALL getDefaultActions() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultActions(sal_Int8 actions) throw(com::sun::star::uno::RuntimeException, std::exception); // XDropTargetDragContext - virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rejectDrag() throw(com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rejectDrag() throw(com::sun::star::uno::RuntimeException, std::exception); // XDropTargetDragContext - virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) throw (com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rejectDrop() throw (com::sun::star::uno::RuntimeException); - virtual void SAL_CALL dropComplete(sal_Bool success) throw (com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) throw (com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rejectDrop() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dropComplete(sal_Bool success) throw (com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception); // NSDraggingDestination protocol functions virtual NSDragOperation draggingEntered(id sender); diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx index 7cfffcd4d7c5..0857116eb58b 100644 --- a/vcl/osx/OSXTransferable.cxx +++ b/vcl/osx/OSXTransferable.cxx @@ -65,7 +65,7 @@ OSXTransferable::~OSXTransferable() Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) - throw( UnsupportedFlavorException, IOException, RuntimeException ) + throw( UnsupportedFlavorException, IOException, RuntimeException, std::exception ) { if (!isValidFlavor(aFlavor) || !isDataFlavorSupported(aFlavor)) { @@ -108,14 +108,14 @@ bool OSXTransferable::isUnicodeText(const DataFlavor& flavor) Sequence< DataFlavor > SAL_CALL OSXTransferable::getTransferDataFlavors( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return mFlavorList; } sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlavor) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { for (sal_Int32 i = 0; i < mFlavorList.getLength(); i++) if (compareDataFlavors(aFlavor, mFlavorList[i])) diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx index cae40a2c7884..2ccbfdf167fa 100644 --- a/vcl/osx/OSXTransferable.hxx +++ b/vcl/osx/OSXTransferable.hxx @@ -54,13 +54,13 @@ public: virtual ::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 ); + throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // Helper functions not part of the XTransferable interface diff --git a/vcl/osx/a11ylistener.cxx b/vcl/osx/a11ylistener.cxx index 46d699c6f859..cd1a450d61b4 100644 --- a/vcl/osx/a11ylistener.cxx +++ b/vcl/osx/a11ylistener.cxx @@ -67,7 +67,7 @@ AquaA11yEventListener::~AquaA11yEventListener() void SAL_CALL -AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException ) +AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { [ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ]; } @@ -75,7 +75,7 @@ AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException ) void SAL_CALL -AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException ) +AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException, std::exception ) { NSString * notification = nil; id element = m_wrapperObject; diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx index ed6ec54ae6c4..6932faec07b4 100644 --- a/vcl/osx/clipboard.cxx +++ b/vcl/osx/clipboard.cxx @@ -144,7 +144,7 @@ AquaClipboard::~AquaClipboard() [mPasteboard release]; } -Reference<XTransferable> SAL_CALL AquaClipboard::getContents() throw(RuntimeException) +Reference<XTransferable> SAL_CALL AquaClipboard::getContents() throw(RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); @@ -162,7 +162,7 @@ Reference<XTransferable> SAL_CALL AquaClipboard::getContents() throw(RuntimeExce void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransferable, const Reference<XClipboardOwner>& xClipboardOwner) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { NSArray* types = xTransferable.is() ? mpDataFlavorMapper->flavorSequenceToTypesArray(xTransferable->getTransferDataFlavors()) : @@ -190,18 +190,18 @@ void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransf fireClipboardChangedEvent(); } -OUString SAL_CALL AquaClipboard::getName() throw( RuntimeException ) +OUString SAL_CALL AquaClipboard::getName() throw( RuntimeException, std::exception ) { return OUString(); } -sal_Int8 SAL_CALL AquaClipboard::getRenderingCapabilities() throw( RuntimeException ) +sal_Int8 SAL_CALL AquaClipboard::getRenderingCapabilities() throw( RuntimeException, std::exception ) { return 0; } void SAL_CALL AquaClipboard::addClipboardListener(const Reference< XClipboardListener >& listener) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); @@ -213,7 +213,7 @@ void SAL_CALL AquaClipboard::addClipboardListener(const Reference< XClipboardLis } void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboardListener >& listener) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); @@ -303,7 +303,7 @@ void AquaClipboard::provideDataForType(NSPasteboard* sender, const NSString* typ } void SAL_CALL AquaClipboard::flushClipboard() - throw(RuntimeException) + throw(RuntimeException, std::exception) { if (mXClipboardContent.is()) { @@ -329,17 +329,17 @@ NSPasteboard* AquaClipboard::getPasteboard() const return mPasteboard; } -OUString SAL_CALL AquaClipboard::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL AquaClipboard::getImplementationName() throw( RuntimeException, std::exception ) { return clipboard_getImplementationName(); } -sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL AquaClipboard::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL AquaClipboard::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return clipboard_getSupportedServiceNames(); } diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx index 596a287d5f22..cc98cc6f14c0 100644 --- a/vcl/osx/clipboard.hxx +++ b/vcl/osx/clipboard.hxx @@ -91,50 +91,50 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setContents( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getName() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XClipboardEx virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XClipboardNotifier virtual void SAL_CALL addClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFlushableClipboard - virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); /* Get a reference to the used pastboard. */ diff --git a/vcl/osx/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx index da69778292e6..4ab3949eaf83 100644 --- a/vcl/osx/documentfocuslistener.cxx +++ b/vcl/osx/documentfocuslistener.cxx @@ -41,7 +41,7 @@ DocumentFocusListener::DocumentFocusListener(AquaA11yFocusTracker& rTracker) : void SAL_CALL DocumentFocusListener::disposing( const EventObject& aEvent ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // Unref the object here, but do not remove as listener since the object // might no longer be in a state that safely allows this. @@ -53,7 +53,7 @@ DocumentFocusListener::disposing( const EventObject& aEvent ) void SAL_CALL DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { switch( aEvent.EventId ) { diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx index 834286683afe..3ed1a37a2ef6 100644 --- a/vcl/osx/documentfocuslistener.hxx +++ b/vcl/osx/documentfocuslistener.hxx @@ -75,11 +75,11 @@ public: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleEventListener virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); private: std::set< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > m_aRefList; diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 017176b4fa14..a20a8951507c 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -250,10 +250,10 @@ private: const sal_Int32 mnBitsPerPixel; // XBitmap - virtual geometry::IntegerSize2D SAL_CALL getSize() throw (uno::RuntimeException) { return maSize; } - virtual ::sal_Bool SAL_CALL hasAlpha( ) throw (uno::RuntimeException) { return mnBitsPerPixel != 8; } + virtual geometry::IntegerSize2D SAL_CALL getSize() throw (uno::RuntimeException, std::exception) { return maSize; } + virtual ::sal_Bool SAL_CALL hasAlpha( ) throw (uno::RuntimeException, std::exception) { return mnBitsPerPixel != 8; } virtual uno::Reference< rendering::XBitmap > SAL_CALL getScaledBitmap( const geometry::RealSize2D&, - sal_Bool ) throw (uno::RuntimeException) { return this; } + sal_Bool ) throw (uno::RuntimeException, std::exception) { return this; } // XIntegerReadOnlyBitmap virtual uno::Sequence< ::sal_Int8 > SAL_CALL getData( rendering::IntegerBitmapLayout& bitmapLayout, @@ -324,7 +324,7 @@ private: return aRet; } - virtual rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (uno::RuntimeException) + virtual rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (uno::RuntimeException, std::exception) { rendering::IntegerBitmapLayout aLayout( maLayout ); @@ -340,7 +340,7 @@ private: } // XBitmapPalette - virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (uno::RuntimeException) + virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (uno::RuntimeException, std::exception) { CPPUNIT_ASSERT_MESSAGE( "Got palette getNumberOfEntries interface call without handing out palette", getPalette().is() ); @@ -389,7 +389,7 @@ private: } }; - virtual uno::Reference< rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (uno::RuntimeException) + virtual uno::Reference< rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (uno::RuntimeException, std::exception) { // this is the method from XBitmapPalette. Return palette color // space here @@ -397,17 +397,17 @@ private: } // XIntegerBitmapColorSpace - 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 maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) { return rendering::RenderingIntent::PERCEPTUAL; } @@ -483,17 +483,17 @@ private: return uno::Sequence< double >(); } - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) { return mnBitsPerPixel; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException) + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) { return maComponentBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) { return util::Endianness::LITTLE; } @@ -519,7 +519,7 @@ private: } virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { const uno::Sequence< rendering::ARGBColor > aTemp( convertIntegerToARGB(deviceColor) ); const sal_Size nLen(aTemp.getLength()); @@ -536,7 +536,7 @@ private: } virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { const sal_Size nLen( deviceColor.getLength() ); const sal_Int32 nBytesPerPixel(mnBitsPerPixel == 8 ? 1 : 4); 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() ) { diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index 521c8b404095..2e2cc9071eb8 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -137,7 +137,7 @@ void X11Clipboard::clearContents() Reference< XTransferable > SAL_CALL X11Clipboard::getContents() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard(m_rSelectionManager.getMutex()); @@ -151,7 +151,7 @@ Reference< XTransferable > SAL_CALL X11Clipboard::getContents() void SAL_CALL X11Clipboard::setContents( const Reference< XTransferable >& xTrans, const Reference< XClipboardOwner >& xClipboardOwner ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // remember old values for callbacks before setting the new ones. ClearableMutexGuard aGuard(m_rSelectionManager.getMutex()); @@ -184,7 +184,7 @@ void SAL_CALL X11Clipboard::setContents( OUString SAL_CALL X11Clipboard::getName() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return m_rSelectionManager.getString( m_aSelection ); } @@ -192,7 +192,7 @@ OUString SAL_CALL X11Clipboard::getName() sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return RenderingCapabilities::Delayed; } @@ -200,7 +200,7 @@ sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities() void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardListener >& listener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( m_rSelectionManager.getMutex() ); m_aListeners.push_back( listener ); @@ -209,7 +209,7 @@ void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardLis void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboardListener >& listener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( m_rSelectionManager.getMutex() ); m_aListeners.remove( listener ); @@ -247,19 +247,19 @@ Reference< XInterface > X11Clipboard::getReference() throw() OUString SAL_CALL X11Clipboard::getImplementationName( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return OUString(X11_CLIPBOARD_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL X11Clipboard::supportsService( const OUString& ServiceName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL X11Clipboard::getSupportedServiceNames( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return X11Clipboard_getSupportedServiceNames(); } diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index 180631f3474a..4ecbc7349933 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -68,46 +68,46 @@ namespace x11 { */ virtual OUString SAL_CALL getImplementationName( ) - throw(RuntimeException); + throw(RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(RuntimeException); + throw(RuntimeException, std::exception); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(RuntimeException); + throw(RuntimeException, std::exception); /* * XClipboard */ virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() - throw(RuntimeException); + throw(RuntimeException, std::exception); virtual void SAL_CALL setContents( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, const com::sun::star::uno::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 com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException); + throw(RuntimeException, std::exception); virtual void SAL_CALL removeClipboardListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException); + throw(RuntimeException, std::exception); /* * SelectionAdaptor diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx index 05361fbec8ec..5b77bd7e2824 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.cxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx @@ -43,17 +43,17 @@ DropTargetDropContext::~DropTargetDropContext() { } -void DropTargetDropContext::acceptDrop( sal_Int8 dragOperation ) throw() +void DropTargetDropContext::acceptDrop( sal_Int8 dragOperation ) throw(std::exception) { m_rManager.accept( dragOperation, m_aDropWindow, m_nTimestamp ); } -void DropTargetDropContext::rejectDrop() throw() +void DropTargetDropContext::rejectDrop() throw(std::exception) { m_rManager.reject( m_aDropWindow, m_nTimestamp ); } -void DropTargetDropContext::dropComplete( sal_Bool success ) throw() +void DropTargetDropContext::dropComplete( sal_Bool success ) throw(std::exception) { m_rManager.dropComplete( success, m_aDropWindow, m_nTimestamp ); } @@ -78,12 +78,12 @@ DropTargetDragContext::~DropTargetDragContext() { } -void DropTargetDragContext::acceptDrag( sal_Int8 dragOperation ) throw() +void DropTargetDragContext::acceptDrag( sal_Int8 dragOperation ) throw(std::exception) { m_rManager.accept( dragOperation, m_aDropWindow, m_nTimestamp ); } -void DropTargetDragContext::rejectDrag() throw() +void DropTargetDragContext::rejectDrag() throw(std::exception) { m_rManager.reject( m_aDropWindow, m_nTimestamp ); } @@ -107,22 +107,22 @@ DragSourceContext::~DragSourceContext() { } -sal_Int32 DragSourceContext::getCurrentCursor() throw() +sal_Int32 DragSourceContext::getCurrentCursor() throw(std::exception) { return m_rManager.getCurrentCursor(); } -void DragSourceContext::setCursor( sal_Int32 cursorId ) throw() +void DragSourceContext::setCursor( sal_Int32 cursorId ) throw(std::exception) { m_rManager.setCursor( cursorId, m_aDropWindow, m_nTimestamp ); } -void DragSourceContext::setImage( sal_Int32 imageId ) throw() +void DragSourceContext::setImage( sal_Int32 imageId ) throw(std::exception) { m_rManager.setImage( imageId, m_aDropWindow, m_nTimestamp ); } -void DragSourceContext::transferablesFlavorsChanged() throw() +void DragSourceContext::transferablesFlavorsChanged() throw(std::exception) { m_rManager.transferablesFlavorsChanged(); } diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx index abdf58e8d81d..109086f29d62 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx @@ -49,9 +49,9 @@ namespace x11 { virtual ~DropTargetDropContext(); // XDropTargetDropContext - virtual void SAL_CALL acceptDrop( sal_Int8 dragOperation ) throw(); - virtual void SAL_CALL rejectDrop() throw(); - virtual void SAL_CALL dropComplete( sal_Bool success ) throw(); + virtual void SAL_CALL acceptDrop( sal_Int8 dragOperation ) throw(std::exception); + virtual void SAL_CALL rejectDrop() throw(std::exception); + virtual void SAL_CALL dropComplete( sal_Bool success ) throw(std::exception); }; class DropTargetDragContext : @@ -68,8 +68,8 @@ namespace x11 { virtual ~DropTargetDragContext(); // XDropTargetDragContext - virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw(); - virtual void SAL_CALL rejectDrag() throw(); + virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw(std::exception); + virtual void SAL_CALL rejectDrag() throw(std::exception); }; class DragSourceContext : @@ -86,10 +86,10 @@ namespace x11 { virtual ~DragSourceContext(); // XDragSourceContext - virtual sal_Int32 SAL_CALL getCurrentCursor() throw(); - virtual void SAL_CALL setCursor( sal_Int32 cursorId ) throw(); - virtual void SAL_CALL setImage( sal_Int32 imageId ) throw(); - virtual void SAL_CALL transferablesFlavorsChanged() throw(); + virtual sal_Int32 SAL_CALL getCurrentCursor() throw(std::exception); + virtual void SAL_CALL setCursor( sal_Int32 cursorId ) throw(std::exception); + virtual void SAL_CALL setImage( sal_Int32 imageId ) throw(std::exception); + virtual void SAL_CALL transferablesFlavorsChanged() throw(std::exception); }; } // namespace diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx index 9c593a487d34..d90e8a58ad84 100644 --- a/vcl/unx/generic/dtrans/X11_droptarget.cxx +++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx @@ -48,7 +48,7 @@ DropTarget::~DropTarget() -void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception ) +void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) { if( arguments.getLength() > 1 ) { @@ -78,7 +78,7 @@ void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::su -void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw() +void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -87,7 +87,7 @@ void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& -void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw() +void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -96,14 +96,14 @@ void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener -sal_Bool DropTarget::isActive() throw() +sal_Bool DropTarget::isActive() throw(std::exception) { return m_bActive; } -void DropTarget::setActive( sal_Bool active ) throw() +void DropTarget::setActive( sal_Bool active ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -112,14 +112,14 @@ void DropTarget::setActive( sal_Bool active ) throw() -sal_Int8 DropTarget::getDefaultActions() throw() +sal_Int8 DropTarget::getDefaultActions() throw(std::exception) { return m_nDefaultActions; } -void DropTarget::setDefaultActions( sal_Int8 actions ) throw() +void DropTarget::setDefaultActions( sal_Int8 actions ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -183,17 +183,17 @@ void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw() } // XServiceInfo -OUString DropTarget::getImplementationName() throw() +OUString DropTarget::getImplementationName() throw(std::exception) { return OUString(XDND_DROPTARGET_IMPLEMENTATION_NAME); } -sal_Bool DropTarget::supportsService( const OUString& ServiceName ) throw() +sal_Bool DropTarget::supportsService( const OUString& ServiceName ) throw(std::exception) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > DropTarget::getSupportedServiceNames() throw() +Sequence< OUString > DropTarget::getSupportedServiceNames() throw(std::exception) { return Xdnd_dropTarget_getSupportedServiceNames(); } diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index ff8e07a80ba0..0ac8dd748297 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -316,7 +316,7 @@ XLIB_Cursor SelectionManager::createCursor( const unsigned char* pPointerData, c return aCursor; } -void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::com::sun::star::uno::Exception) +void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::com::sun::star::uno::Exception, std::exception) { osl::MutexGuard aGuard(m_aMutex); @@ -2932,14 +2932,14 @@ void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time ) * XDragSource */ -sal_Bool SelectionManager::isDragImageSupported() throw() +sal_Bool SelectionManager::isDragImageSupported() throw(std::exception) { return sal_False; } -sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw() +sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) { XLIB_Cursor aCursor = m_aNoneCursor; if( dragAction & DNDConstants::ACTION_MOVE ) @@ -3190,7 +3190,7 @@ void SelectionManager::startDrag( sal_Int32, const css::uno::Reference< XTransferable >& transferable, const css::uno::Reference< XDragSourceListener >& listener - ) throw() + ) throw(std::exception) { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "startDrag( sourceActions = %x )\n", (int)sourceActions ); @@ -3857,7 +3857,7 @@ void SelectionManager::shutdown() throw() -sal_Bool SelectionManager::handleEvent( const Any& event ) throw() +sal_Bool SelectionManager::handleEvent( const Any& event ) throw(std::exception) { Sequence< sal_Int8 > aSeq; if( (event >>= aSeq) ) @@ -3893,14 +3893,14 @@ sal_Bool SelectionManager::handleEvent( const Any& event ) throw() } void SAL_CALL SelectionManager::disposing( const ::com::sun::star::lang::EventObject& rEvt ) - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { if (rEvt.Source == m_xDesktop || rEvt.Source == m_xDisplayConnection) shutdown(); } void SAL_CALL SelectionManager::queryTermination( const ::com::sun::star::lang::EventObject& ) - throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ) { } @@ -3910,7 +3910,7 @@ void SAL_CALL SelectionManager::queryTermination( const ::com::sun::star::lang:: * has been called before vcl is shutdown */ void SAL_CALL SelectionManager::notifyTermination( const ::com::sun::star::lang::EventObject& rEvent ) - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { disposing(rEvent); } @@ -4097,7 +4097,7 @@ SelectionManagerHolder::~SelectionManagerHolder() -void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception ) +void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) { OUString aDisplayName; @@ -4121,14 +4121,14 @@ void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) thro * XDragSource */ -sal_Bool SelectionManagerHolder::isDragImageSupported() throw() +sal_Bool SelectionManagerHolder::isDragImageSupported() throw(std::exception) { return m_xRealDragSource.is() ? m_xRealDragSource->isDragImageSupported() : sal_False; } -sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw() +sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) { return m_xRealDragSource.is() ? m_xRealDragSource->getDefaultCursor( dragAction ) : 0; } @@ -4140,7 +4140,7 @@ void SelectionManagerHolder::startDrag( sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const css::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable, const css::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener >& listener - ) throw() + ) throw(std::exception) { if( m_xRealDragSource.is() ) m_xRealDragSource->startDrag( trigger, sourceActions, cursor, image, transferable, listener ); @@ -4154,17 +4154,17 @@ void SelectionManagerHolder::startDrag( -OUString SelectionManagerHolder::getImplementationName() throw() +OUString SelectionManagerHolder::getImplementationName() throw(std::exception) { return OUString(XDND_IMPLEMENTATION_NAME); } -sal_Bool SelectionManagerHolder::supportsService( const OUString& ServiceName ) throw() +sal_Bool SelectionManagerHolder::supportsService( const OUString& ServiceName ) throw(std::exception) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SelectionManagerHolder::getSupportedServiceNames() throw() +Sequence< OUString > SelectionManagerHolder::getSupportedServiceNames() throw(std::exception) { return Xdnd_getSupportedServiceNames(); } diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index db8c8741b9e1..fe7306596203 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -94,21 +94,21 @@ namespace x11 { void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( ::com::sun::star::uno::Exception ); + virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( ::com::sun::star::uno::Exception, std::exception ); // XDropTarget - virtual void SAL_CALL addDropTargetListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(); - virtual void SAL_CALL removeDropTargetListener( const com::sun::star::uno::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 com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception); + virtual void SAL_CALL removeDropTargetListener( const com::sun::star::uno::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); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(); + virtual OUString SAL_CALL getImplementationName() throw(std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception); virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getSupportedServiceNames() throw(); + SAL_CALL getSupportedServiceNames() throw(std::exception); }; class SelectionManagerHolder : @@ -126,23 +126,23 @@ namespace x11 { virtual ~SelectionManagerHolder(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(); + virtual OUString SAL_CALL getImplementationName() throw(std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception); virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getSupportedServiceNames() throw(); + SAL_CALL getSupportedServiceNames() 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 ); // 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 ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable, const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener >& listener - ) throw(); + ) throw(std::exception); }; @@ -476,20 +476,20 @@ namespace x11 { void shutdown() throw(); // 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 ); // XEventHandler - virtual sal_Bool SAL_CALL handleEvent( const Any& event ) throw(); + virtual sal_Bool SAL_CALL handleEvent( const Any& event ) throw(std::exception); // 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 ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable, const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener >& listener - ) throw(); + ) throw(std::exception); // SelectionAdaptor for XdndSelection Drag (we are drag source) virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > getTransferable() throw(); @@ -498,13 +498,13 @@ namespace x11 { virtual com::sun::star::uno::Reference< XInterface > getReference() throw(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XTerminateListener virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index 4ecac7165a36..5321f084ae13 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -55,7 +55,7 @@ X11Transferable::~X11Transferable() Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) - throw(UnsupportedFlavorException, IOException, RuntimeException) + throw(UnsupportedFlavorException, IOException, RuntimeException, std::exception) { Any aRet; Sequence< sal_Int8 > aData; @@ -88,7 +88,7 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() - throw(RuntimeException) + throw(RuntimeException, std::exception) { Sequence< DataFlavor > aFlavorList; bool bSuccess = m_rManager.getPasteDataTypes( m_aSelection ? m_aSelection : XA_PRIMARY, aFlavorList ); @@ -101,7 +101,7 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFlavor ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if( aFlavor.DataType != getCppuType( (Sequence< sal_Int8 >*)0 ) ) { diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx index 1a4145462b06..d1263a64d6b2 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.hxx +++ b/vcl/unx/generic/dtrans/X11_transferable.hxx @@ -46,14 +46,14 @@ namespace x11 { virtual ::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::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx index f13a0a318601..ebdac0053ed6 100644 --- a/vcl/unx/gtk/a11y/atklistener.cxx +++ b/vcl/unx/gtk/a11y/atklistener.cxx @@ -89,7 +89,7 @@ extern "C" { } // XEventListener implementation -void AtkListener::disposing( const lang::EventObject& ) throw (uno::RuntimeException) +void AtkListener::disposing( const lang::EventObject& ) throw (uno::RuntimeException, std::exception) { if( mpWrapper ) { @@ -268,7 +268,7 @@ getAccessibleContextFromSource( const uno::Reference< uno::XInterface >& rxSourc /*****************************************************************************/ // XAccessibleEventListener -void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException ) +void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException, std::exception ) { if( !mpWrapper ) return; diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx index c878a1fe469a..8b3cb7fff5d3 100644 --- a/vcl/unx/gtk/a11y/atklistener.hxx +++ b/vcl/unx/gtk/a11y/atklistener.hxx @@ -36,11 +36,11 @@ public: // XEventListener virtual void disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleEventListener virtual void notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); AtkObjectWrapper *mpWrapper; AccessibleVector m_aChildList; diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index d487a67e6125..e8fe27a65d7c 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -181,16 +181,16 @@ public: throw (lang::IndexOutOfBoundsException, uno::RuntimeException); // XEventListener - virtual void disposing( const lang::EventObject& Source ) throw (uno::RuntimeException); + virtual void disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception); // XAccessibleEventListener - virtual void notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException ); + virtual void notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException, std::exception ); }; /*****************************************************************************/ void DocumentFocusListener::disposing( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // Unref the object here, but do not remove as listener since the object @@ -203,7 +203,7 @@ void DocumentFocusListener::disposing( const lang::EventObject& aEvent ) /*****************************************************************************/ void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { switch( aEvent.EventId ) { diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index da9f630b57bb..ce7d1ed42cc9 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -317,7 +317,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -327,7 +327,7 @@ void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFil } void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -600,7 +600,7 @@ void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -621,7 +621,7 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUSt void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -687,7 +687,7 @@ void SalGtkFilePicker::UpdateFilterfromUI() } } -OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -708,7 +708,7 @@ OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeExcept void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters ) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -739,7 +739,7 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle // XFilePicker functions -void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException ) +void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -749,7 +749,7 @@ void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( u } void SAL_CALL SalGtkFilePicker::setDefaultName( const OUString& aName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -764,21 +764,21 @@ void SAL_CALL SalGtkFilePicker::setDefaultName( const OUString& aName ) } void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const OUString& rDirectory ) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; implsetDisplayDirectory(rDirectory); } -OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; return implgetDisplayDirectory(); } -uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException ) +uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException, std::exception ) { // no member access => no mutex needed @@ -811,7 +811,7 @@ bool lcl_matchFilter( const rtl::OUString& rFilter, const rtl::OUString& rExt ) } -uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException ) +uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -960,14 +960,14 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno // XExecutableDialog functions -void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException ) +void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; implsetTitle(rTitle); } -sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException ) +sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1331,7 +1331,7 @@ uno::Any SalGtkFilePicker::HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nC } void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1359,7 +1359,7 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr } uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1384,7 +1384,7 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nC } void SAL_CALL SalGtkFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnable ) -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1412,7 +1412,7 @@ throw( uno::RuntimeException ) } void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& rLabel ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1449,7 +1449,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& } OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1473,7 +1473,7 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) // XFilePreview functions -uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() throw( uno::RuntimeException ) +uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1483,7 +1483,7 @@ uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() t return uno::Sequence<sal_Int16>(); } -sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeException ) +sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1493,7 +1493,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeEx return 0; } -sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth() throw( uno::RuntimeException ) +sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1502,7 +1502,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth() throw( uno::RuntimeExce return m_PreviewImageWidth; } -sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight() throw( uno::RuntimeException ) +sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1512,7 +1512,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight() throw( uno::RuntimeExc } void SAL_CALL SalGtkFilePicker::setImage( sal_Int16 /*aImageFormat*/, const uno::Any& /*aImage*/ ) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1612,7 +1612,7 @@ void SalGtkFilePicker::update_preview_cb( GtkFileChooser *file_chooser, SalGtkFi g_free( filename ); } -sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( uno::RuntimeException ) +sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1646,7 +1646,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( u return true; } -sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException ) +sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1660,7 +1660,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments ) - throw( uno::Exception, uno::RuntimeException ) + throw( uno::Exception, uno::RuntimeException, std::exception ) { // parameter checking uno::Any aAny; @@ -1824,7 +1824,7 @@ void SalGtkFilePicker::preview_toggled_cb( GObject *cb, SalGtkFilePicker* pobjFP // XCancellable -void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException ) +void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index c40355f8791f..4daa294e98b0 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -70,124 +70,124 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XExecutableDialog functions virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int16 SAL_CALL execute() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilePicker functions virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setDefaultName( const OUString& aName ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getDisplayDirectory( ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilePicker2 functions virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XFilterManager functions virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getCurrentFilter( ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilterGroupManager functions virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); // XFilePickerControlAccess functions virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) - throw(::com::sun::star::uno::RuntimeException ); + throw(::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XFilePreview virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getTargetColorDepth( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getAvailableWidth( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getAvailableHeight( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& aImage ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getShowState( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XCancellable virtual void SAL_CALL cancel( ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XEventListener diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index 8b0f7fbf983f..46fdcdbe4475 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -75,7 +75,7 @@ void SAL_CALL SalGtkFolderPicker::disposing( const lang::EventObject& ) } void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirectory ) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -95,7 +95,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirector aTxt.getStr() ); } -OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -109,7 +109,7 @@ OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeE return aCurrentFolderName; } -OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -124,7 +124,7 @@ OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeExceptio } void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription*/ ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { } @@ -132,7 +132,7 @@ void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription // XExecutableDialog functions -void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException ) +void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -143,7 +143,7 @@ void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno: gtk_window_set_title( GTK_WINDOW( m_pDialog ), aWindowTitle.getStr() ); } -sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException ) +sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -181,7 +181,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException ) // XCancellable -void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException ) +void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index c0921dfd7a3c..e4ca5bf62892 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -42,33 +42,33 @@ class SalGtkFolderPicker : virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int16 SAL_CALL execute( ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFolderPicker functions virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) - throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); + throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getDisplayDirectory( ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getDirectory( ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setDescription( const OUString& rDescription ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XCancellable virtual void SAL_CALL cancel( ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XEventListener diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index aa280df9ffde..25553aa6ad3b 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -130,7 +130,7 @@ RunDialog::~RunDialog() } void SAL_CALL RunDialog::windowOpened( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -138,12 +138,12 @@ void SAL_CALL RunDialog::windowOpened( const ::com::sun::star::lang::EventObject } void SAL_CALL RunDialog::queryTermination( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL RunDialog::notifyTermination( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index 57889bbec785..a3ae4690189e 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -93,27 +93,27 @@ public: // XTopWindowListener using cppu::WeakComponentImplHelperBase::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::uno::RuntimeException) {} + throw(::com::sun::star::uno::RuntimeException, std::exception) {} virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) {} + throw (::com::sun::star::uno::RuntimeException, std::exception) {} virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) {} + throw (::com::sun::star::uno::RuntimeException, std::exception) {} virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) {} + throw (::com::sun::star::uno::RuntimeException, std::exception) {} virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) {} + throw (::com::sun::star::uno::RuntimeException, std::exception) {} virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) {} + throw (::com::sun::star::uno::RuntimeException, std::exception) {} virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) {} + throw (::com::sun::star::uno::RuntimeException, std::exception) {} // XTerminateListener virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); public: RunDialog(GtkWidget *pDialog, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit, diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index ca378f6534fc..43dec15789fa 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -129,7 +129,7 @@ UnxFilePicker::~UnxFilePicker() } void SAL_CALL UnxFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { OSL_ASSERT( m_pNotifyThread ); osl::MutexGuard aGuard( m_aMutex ); @@ -138,7 +138,7 @@ void SAL_CALL UnxFilePicker::addFilePickerListener( const uno::Reference<XFilePi } void SAL_CALL UnxFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { OSL_ASSERT( m_pNotifyThread ); osl::MutexGuard aGuard( m_aMutex ); @@ -147,7 +147,7 @@ void SAL_CALL UnxFilePicker::removeFilePickerListener( const uno::Reference<XFil } void SAL_CALL UnxFilePicker::setTitle( const OUString &rTitle ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -161,7 +161,7 @@ void SAL_CALL UnxFilePicker::setTitle( const OUString &rTitle ) } sal_Int16 SAL_CALL UnxFilePicker::execute() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { checkFilePicker(); @@ -178,7 +178,7 @@ sal_Int16 SAL_CALL UnxFilePicker::execute() } void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -191,7 +191,7 @@ void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode ) } void SAL_CALL UnxFilePicker::setDefaultName( const OUString &rName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -205,7 +205,7 @@ void SAL_CALL UnxFilePicker::setDefaultName( const OUString &rName ) } void SAL_CALL UnxFilePicker::setDisplayDirectory( const OUString &rDirectory ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -219,7 +219,7 @@ void SAL_CALL UnxFilePicker::setDisplayDirectory( const OUString &rDirectory ) } OUString SAL_CALL UnxFilePicker::getDisplayDirectory() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -231,7 +231,7 @@ OUString SAL_CALL UnxFilePicker::getDisplayDirectory() } uno::Sequence< OUString > SAL_CALL UnxFilePicker::getFiles() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -243,7 +243,7 @@ uno::Sequence< OUString > SAL_CALL UnxFilePicker::getFiles() } void SAL_CALL UnxFilePicker::appendFilter( const OUString &rTitle, const OUString &rFilter ) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -259,7 +259,7 @@ void SAL_CALL UnxFilePicker::appendFilter( const OUString &rTitle, const OUStrin } void SAL_CALL UnxFilePicker::setCurrentFilter( const OUString &rTitle ) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -273,7 +273,7 @@ void SAL_CALL UnxFilePicker::setCurrentFilter( const OUString &rTitle ) } OUString SAL_CALL UnxFilePicker::getCurrentFilter() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -285,7 +285,7 @@ OUString SAL_CALL UnxFilePicker::getCurrentFilter() } void SAL_CALL UnxFilePicker::appendFilterGroup( const OUString &rGroupTitle, const uno::Sequence<beans::StringPair> &rFilters ) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -309,7 +309,7 @@ void SAL_CALL UnxFilePicker::appendFilterGroup( const OUString &rGroupTitle, con } void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any &rValue ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -390,7 +390,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA } uno::Any SAL_CALL UnxFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -416,7 +416,7 @@ uno::Any SAL_CALL UnxFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nCont } void SAL_CALL UnxFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnable ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -431,7 +431,7 @@ void SAL_CALL UnxFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnab } void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const OUString &rLabel ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); @@ -447,7 +447,7 @@ void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const OUString &rLa } OUString SAL_CALL UnxFilePicker::getLabel(sal_Int16 /*nControlId*/) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { // FIXME getLabel() is not yet implemented checkFilePicker(); @@ -523,7 +523,7 @@ sal_Bool SAL_CALL UnxFilePicker::getShowState() */ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArguments ) - throw( uno::Exception, uno::RuntimeException ) + throw( uno::Exception, uno::RuntimeException, std::exception ) { initFilePicker(); @@ -629,7 +629,7 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen } void SAL_CALL UnxFilePicker::cancel() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { // FIXME cancel() is not implemented checkFilePicker(); @@ -648,19 +648,19 @@ void SAL_CALL UnxFilePicker::disposing( const lang::EventObject &rEvent ) } OUString SAL_CALL UnxFilePicker::getImplementationName() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return OUString( FILE_PICKER_IMPL_NAME ); } sal_Bool SAL_CALL UnxFilePicker::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL UnxFilePicker::getSupportedServiceNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return FilePicker_getSupportedServiceNames(); } @@ -917,7 +917,7 @@ void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId ) } uno::Sequence< OUString > SAL_CALL UnxFilePicker::getSelectedFiles() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return getFiles(); } diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx index 58aec56647e4..4f639763018f 100644 --- a/vcl/unx/kde/UnxFilePicker.hxx +++ b/vcl/unx/kde/UnxFilePicker.hxx @@ -78,39 +78,39 @@ public: // XFilePickerNotifier - virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception); /* TODO XFilePreview @@ -126,15 +126,15 @@ public: // XFilePicker2 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ); // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XEventListener @@ -142,9 +142,9 @@ public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); private: // prevent copy and assignment diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index e8ddaebd5464..a66420191b2d 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -213,21 +213,21 @@ void KDE4FilePicker::cleanupProxy() } void SAL_CALL KDE4FilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; m_xListener = xListener; } void SAL_CALL KDE4FilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; m_xListener.clear(); } void SAL_CALL KDE4FilePicker::setTitle( const OUString &title ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser aReleaser; @@ -238,7 +238,7 @@ void SAL_CALL KDE4FilePicker::setTitle( const OUString &title ) } sal_Int16 SAL_CALL KDE4FilePicker::execute() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser aReleaser; @@ -277,7 +277,7 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute() } void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -301,7 +301,7 @@ void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect ) } void SAL_CALL KDE4FilePicker::setDefaultName( const OUString &name ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -313,7 +313,7 @@ void SAL_CALL KDE4FilePicker::setDefaultName( const OUString &name ) } void SAL_CALL KDE4FilePicker::setDisplayDirectory( const OUString &dir ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -325,7 +325,7 @@ void SAL_CALL KDE4FilePicker::setDisplayDirectory( const OUString &dir ) } OUString SAL_CALL KDE4FilePicker::getDisplayDirectory() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -337,7 +337,7 @@ OUString SAL_CALL KDE4FilePicker::getDisplayDirectory() } uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -353,7 +353,7 @@ uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles() } uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -364,7 +364,7 @@ uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles() } void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUString &filter ) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -391,7 +391,7 @@ void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUStrin } void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title ) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -404,7 +404,7 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title ) } OUString SAL_CALL KDE4FilePicker::getCurrentFilter() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -425,7 +425,7 @@ OUString SAL_CALL KDE4FilePicker::getCurrentFilter() } void SAL_CALL KDE4FilePicker::appendFilterGroup( const OUString& rGroupTitle, const uno::Sequence<beans::StringPair>& filters) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -441,7 +441,7 @@ void SAL_CALL KDE4FilePicker::appendFilterGroup( const OUString& rGroupTitle, co } void SAL_CALL KDE4FilePicker::setValue( sal_Int16 controlId, sal_Int16 nControlAction, const uno::Any &value ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -458,7 +458,7 @@ void SAL_CALL KDE4FilePicker::setValue( sal_Int16 controlId, sal_Int16 nControlA } uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 nControlAction ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if (CHECKBOX_AUTOEXTENSION == controlId) // We ignore this one and rely on KFileDialog to provide the function. @@ -486,7 +486,7 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 nCont } void SAL_CALL KDE4FilePicker::enableControl( sal_Int16 controlId, sal_Bool enable ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -500,7 +500,7 @@ void SAL_CALL KDE4FilePicker::enableControl( sal_Int16 controlId, sal_Bool enabl } void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &label ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -517,7 +517,7 @@ void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &lab } OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -630,7 +630,7 @@ void KDE4FilePicker::addCustomControl(sal_Int16 controlId) } void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) - throw( uno::Exception, uno::RuntimeException ) + throw( uno::Exception, uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser release; @@ -736,7 +736,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) } void SAL_CALL KDE4FilePicker::cancel() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { } @@ -753,19 +753,19 @@ void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent ) } OUString SAL_CALL KDE4FilePicker::getImplementationName() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return OUString( FILE_PICKER_IMPL_NAME ); } sal_Bool SAL_CALL KDE4FilePicker::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSupportedServiceNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return FilePicker_getSupportedServiceNames(); } diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx index 7c29af7a1fee..3cde3cf140e7 100644 --- a/vcl/unx/kde4/KDE4FilePicker.hxx +++ b/vcl/unx/kde4/KDE4FilePicker.hxx @@ -87,34 +87,34 @@ public: virtual ~KDE4FilePicker(); // XFilePickerNotifier - virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception); /* TODO XFilePreview @@ -129,22 +129,22 @@ public: // XFilePicker2 functions virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ); // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject &rEvent ) throw( ::com::sun::star::uno::RuntimeException ); using cppu::WeakComponentImplHelperBase::disposing; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); private Q_SLOTS: // XExecutableDialog functions |