diff options
Diffstat (limited to 'vcl')
74 files changed, 645 insertions, 1016 deletions
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index 5df5eb28a256..cffeb7c5bbd6 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -63,46 +63,46 @@ namespace unotools public: // XBitmap - virtual css::geometry::IntegerSize2D SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasAlpha( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& newSize, sal_Bool beFast ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::geometry::IntegerSize2D SAL_CALL getSize() override; + virtual sal_Bool SAL_CALL hasAlpha( ) override; + virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& newSize, sal_Bool beFast ) override; // XIntegerReadOnlyBitmap - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerRectangle2D& rect ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerPoint2D& pos ) override; /// @throws css::uno::RuntimeException - css::uno::Reference< css::rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (css::uno::RuntimeException); - virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::rendering::XBitmapPalette > SAL_CALL getPalette( ); + virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) override; // XBitmapPalette - virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getIndex( css::uno::Sequence< double >& entry, ::sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setIndex( const css::uno::Sequence< double >& color, sal_Bool transparency, ::sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getNumberOfEntries() override; + virtual sal_Bool SAL_CALL getIndex( css::uno::Sequence< double >& entry, ::sal_Int32 nIndex ) override; + virtual sal_Bool SAL_CALL setIndex( const css::uno::Sequence< double >& color, sal_Bool transparency, ::sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getColorSpace( ) override; // XIntegerBitmapColorSpace - virtual ::sal_Int8 SAL_CALL getType( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getProperties( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL convertColorSpace( const css::uno::Sequence< double >& deviceColor, const css::uno::Reference< css::rendering::XColorSpace >& targetColorSpace ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertToRGB( const css::uno::Sequence< double >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertToARGB( const css::uno::Sequence< double >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertToPARGB( const css::uno::Sequence< double >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL convertFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL convertFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL convertFromPARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XColorSpace >& targetColorSpace ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int8 SAL_CALL getType( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) override; + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getProperties( ) override; + virtual css::uno::Sequence< double > SAL_CALL convertColorSpace( const css::uno::Sequence< double >& deviceColor, const css::uno::Reference< css::rendering::XColorSpace >& targetColorSpace ) override; + virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertToRGB( const css::uno::Sequence< double >& deviceColor ) override; + virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertToARGB( const css::uno::Sequence< double >& deviceColor ) override; + virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertToPARGB( const css::uno::Sequence< double >& deviceColor ) override; + virtual css::uno::Sequence< double > SAL_CALL convertFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) override; + virtual css::uno::Sequence< double > SAL_CALL convertFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override; + virtual css::uno::Sequence< double > SAL_CALL convertFromPARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override; + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) override; + virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) override; + virtual ::sal_Int8 SAL_CALL getEndianness( ) override; + virtual css::uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XColorSpace >& targetColorSpace ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override; + virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override; + virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override; + virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override; /** Create API wrapper for given BitmapEx diff --git a/vcl/inc/displayconnectiondispatch.hxx b/vcl/inc/displayconnectiondispatch.hxx index 72d6279d79f0..04468995edc4 100644 --- a/vcl/inc/displayconnectiondispatch.hxx +++ b/vcl/inc/displayconnectiondispatch.hxx @@ -49,11 +49,11 @@ public: bool dispatchEvent( void* pData, int nBytes ); // XDisplayConnection - virtual void SAL_CALL addEventHandler( const css::uno::Any& window, const css::uno::Reference< css::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw(std::exception) override; - virtual void SAL_CALL removeEventHandler( const css::uno::Any& window, const css::uno::Reference< css::awt::XEventHandler >& handler ) throw(std::exception) override; - virtual void SAL_CALL addErrorHandler( const css::uno::Reference< css::awt::XEventHandler >& handler ) throw(std::exception) override; - virtual void SAL_CALL removeErrorHandler( const css::uno::Reference< css::awt::XEventHandler >& handler ) throw(std::exception) override; - virtual css::uno::Any SAL_CALL getIdentifier() throw(std::exception) override; + virtual void SAL_CALL addEventHandler( const css::uno::Any& window, const css::uno::Reference< css::awt::XEventHandler >& handler, sal_Int32 eventMask ) override; + virtual void SAL_CALL removeEventHandler( const css::uno::Any& window, const css::uno::Reference< css::awt::XEventHandler >& handler ) override; + virtual void SAL_CALL addErrorHandler( const css::uno::Reference< css::awt::XEventHandler >& handler ) override; + virtual void SAL_CALL removeErrorHandler( const css::uno::Reference< css::awt::XEventHandler >& handler ) override; + virtual css::uno::Any SAL_CALL getIdentifier() override; }; diff --git a/vcl/inc/dndeventdispatcher.hxx b/vcl/inc/dndeventdispatcher.hxx index 4d35032c9cb2..a6af677350df 100644 --- a/vcl/inc/dndeventdispatcher.hxx +++ b/vcl/inc/dndeventdispatcher.hxx @@ -49,27 +49,27 @@ class DNDEventDispatcher: public ::cppu::WeakImplHelper< /// @throws css::uno::RuntimeException static sal_Int32 fireDragEnterEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction, - const css::uno::Sequence< css::datatransfer::DataFlavor >& aFlavorList ) throw(css::uno::RuntimeException); + const css::uno::Sequence< css::datatransfer::DataFlavor >& aFlavorList ); /// @throws css::uno::RuntimeException static sal_Int32 fireDragOverEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext >& xContext, - const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(css::uno::RuntimeException); + const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ); /// @throws css::uno::RuntimeException - static sal_Int32 fireDragExitEvent( vcl::Window *pWindow ) throw(css::uno::RuntimeException); + static sal_Int32 fireDragExitEvent( vcl::Window *pWindow ); /// @throws css::uno::RuntimeException static sal_Int32 fireDropActionChangedEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext >& xContext, - const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(css::uno::RuntimeException); + const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ); /// @throws css::uno::RuntimeException static sal_Int32 fireDropEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDropTargetDropContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction, - const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable ) throw(css::uno::RuntimeException); + const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable ); /// @throws css::uno::RuntimeException static sal_Int32 fireDragGestureEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDragSource >& xSource, - const css::uno::Any& event, const Point& rOrigin, const sal_Int8 nDragAction )throw(css::uno::RuntimeException); + const css::uno::Any& event, const Point& rOrigin, const sal_Int8 nDragAction ); public: @@ -80,30 +80,30 @@ public: * XDropTargetDragContext */ - virtual void SAL_CALL acceptDrag( sal_Int8 dropAction ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rejectDrag() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acceptDrag( sal_Int8 dropAction ) override; + virtual void SAL_CALL rejectDrag() override; /* * XDropTargetListener */ - virtual void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) override; + virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) override; + virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) override; + virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) override; + virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) override; /* * XDragGestureListener */ - virtual void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) override; /* * XEventListener */ - virtual void SAL_CALL disposing( const css::lang::EventObject& eo ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& eo ) override; }; #endif diff --git a/vcl/inc/dndlistenercontainer.hxx b/vcl/inc/dndlistenercontainer.hxx index 078b4aa3721b..e78da03f1bf8 100644 --- a/vcl/inc/dndlistenercontainer.hxx +++ b/vcl/inc/dndlistenercontainer.hxx @@ -76,35 +76,35 @@ public: * XDragGestureRecognizer */ - virtual void SAL_CALL addDragGestureListener( const css::uno::Reference< css::datatransfer::dnd::XDragGestureListener >& dgl ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeDragGestureListener( const css::uno::Reference< css::datatransfer::dnd::XDragGestureListener >& dgl ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL resetRecognizer( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addDragGestureListener( const css::uno::Reference< css::datatransfer::dnd::XDragGestureListener >& dgl ) override; + virtual void SAL_CALL removeDragGestureListener( const css::uno::Reference< css::datatransfer::dnd::XDragGestureListener >& dgl ) override; + virtual void SAL_CALL resetRecognizer( ) override; /* * XDropTargetDragContext */ - virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rejectDrag( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) override; + virtual void SAL_CALL rejectDrag( ) override; /* * XDropTargetDropContext */ - virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rejectDrop( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropComplete( sal_Bool success ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) override; + virtual void SAL_CALL rejectDrop( ) override; + virtual void SAL_CALL dropComplete( sal_Bool success ) override; /* * XDropTarget */ - virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isActive( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActive( sal_Bool active ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getDefaultActions( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) override; + virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) override; + virtual sal_Bool SAL_CALL isActive( ) override; + virtual void SAL_CALL setActive( sal_Bool active ) override; + virtual sal_Int8 SAL_CALL getDefaultActions( ) override; + virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) override; }; #endif diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx index 353b6428d9a7..a5355946786d 100644 --- a/vcl/inc/osx/a11ylistener.hxx +++ b/vcl/inc/osx/a11ylistener.hxx @@ -38,12 +38,10 @@ public: virtual ~AquaA11yEventListener() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override; private: const id m_wrapperObject; diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index e20ca9dd3850..250fd9b1ca1b 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -75,17 +75,12 @@ protected: std::vector<css::datatransfer::DataFlavor> getTransferDataFlavorsAsVector(GdkAtom *targets, gint n_targets); public: - virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor) - throw(css::datatransfer::UnsupportedFlavorException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor) override = 0; virtual std::vector<css::datatransfer::DataFlavor> getTransferDataFlavorsAsVector() = 0; - virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors() - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& rFlavor) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors() override; + virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& rFlavor) override; }; class GtkDropTarget : public cppu::WeakComponentImplHelper<css::datatransfer::dnd::XDropTarget, @@ -102,28 +97,22 @@ public: virtual ~GtkDropTarget() override; // XInitialization - virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArgs) - throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArgs) override; void deinitialize(); // XDropTarget - virtual void SAL_CALL addDropTargetListener(const css::uno::Reference<css::datatransfer::dnd::XDropTargetListener>&) - throw (std::exception) override; - virtual void SAL_CALL removeDropTargetListener(const css::uno::Reference<css::datatransfer::dnd::XDropTargetListener>&) - throw (std::exception) override; - virtual sal_Bool SAL_CALL isActive() throw(std::exception) override; - virtual void SAL_CALL setActive(sal_Bool active) throw(std::exception) override; - virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception) override; - virtual void SAL_CALL setDefaultActions(sal_Int8 actions) throw(std::exception) override; + virtual void SAL_CALL addDropTargetListener(const css::uno::Reference<css::datatransfer::dnd::XDropTargetListener>&) override; + virtual void SAL_CALL removeDropTargetListener(const css::uno::Reference<css::datatransfer::dnd::XDropTargetListener>&) override; + virtual sal_Bool SAL_CALL isActive() override; + virtual void SAL_CALL setActive(sal_Bool active) override; + virtual sal_Int8 SAL_CALL getDefaultActions() override; + virtual void SAL_CALL setDefaultActions(sal_Int8 actions) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; void fire_dragEnter(const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee); void fire_dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde); @@ -150,26 +139,22 @@ public: virtual ~GtkDragSource() override; // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultCursor(sal_Int8 dragAction) throw(std::exception) override; + virtual sal_Bool SAL_CALL isDragImageSupported() override; + virtual sal_Int32 SAL_CALL getDefaultCursor(sal_Int8 dragAction) override; virtual void SAL_CALL startDrag( const css::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const css::uno::Reference< css::datatransfer::XTransferable >& transferable, - const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener) throw(std::exception) override; + const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener) override; // XInitialization - virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any >& rArguments) - throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any >& rArguments) override; void deinitialize(); - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; void dragFailed(); void dragDelete(); diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx index d794d1fb808d..1a50d4fbc3db 100644 --- a/vcl/osx/DragSource.cxx +++ b/vcl/osx/DragSource.cxx @@ -158,7 +158,6 @@ DragSource::~DragSource() } void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments) - throw(Exception, std::exception) { if (aArguments.getLength() < 2) { @@ -203,13 +202,11 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments) } sal_Bool SAL_CALL DragSource::isDragImageSupported( ) - throw(RuntimeException, std::exception) { return true; } sal_Int32 SAL_CALL DragSource::getDefaultCursor( sal_Int8 /*dragAction*/ ) - throw( IllegalArgumentException, RuntimeException, std::exception) { return 0; } @@ -220,7 +217,6 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger, sal_Int32 /*image*/, const uno::Reference<XTransferable >& transferable, const uno::Reference<XDragSourceListener >& listener ) - throw( RuntimeException, std::exception) { MutexGuard guard(m_aMutex); @@ -323,17 +319,17 @@ unsigned int DragSource::getSupportedDragOperations(bool isLocal) const return srcActions; } -OUString SAL_CALL DragSource::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL DragSource::getImplementationName( ) { return dragSource_getImplementationName(); } -sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames() { return dragSource_getSupportedServiceNames(); } diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx index 597e0728516e..9027ac455a7c 100644 --- a/vcl/osx/DragSource.hxx +++ b/vcl/osx/DragSource.hxx @@ -79,27 +79,24 @@ public: DragSource& operator=(const DragSource&) = delete; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw(css::uno::Exception, std::exception/*, css::uno::RuntimeException*/) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDragImageSupported( ) override; - virtual sal_Int32 SAL_CALL getDefaultCursor(sal_Int8 dragAction) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDefaultCursor(sal_Int8 dragAction) override; virtual void SAL_CALL startDrag( const css::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const css::uno::Reference< css::datatransfer::XTransferable >& transferable, - const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener ) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; void saveMouseEvent(NSEvent* theEvent); unsigned int getSupportedDragOperations(bool isLocal) const; diff --git a/vcl/osx/DragSourceContext.cxx b/vcl/osx/DragSourceContext.cxx index 319e969e8e99..253dc867d3de 100644 --- a/vcl/osx/DragSourceContext.cxx +++ b/vcl/osx/DragSourceContext.cxx @@ -36,23 +36,19 @@ DragSourceContext::~DragSourceContext() } sal_Int32 SAL_CALL DragSourceContext::getCurrentCursor( ) - throw( RuntimeException, std::exception) { return 0; } void SAL_CALL DragSourceContext::setCursor( sal_Int32 /*cursorId*/ ) - throw( RuntimeException, std::exception) { } void SAL_CALL DragSourceContext::setImage( sal_Int32 /*imageId*/ ) - throw( RuntimeException, std::exception) { } void SAL_CALL DragSourceContext::transferablesFlavorsChanged( ) - throw( RuntimeException, std::exception) { } diff --git a/vcl/osx/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx index 833b7d1093ea..3ebeb362b4d9 100644 --- a/vcl/osx/DragSourceContext.hxx +++ b/vcl/osx/DragSourceContext.hxx @@ -39,17 +39,13 @@ public: DragSourceContext(const DragSourceContext&) = delete; DragSourceContext& operator=(const DragSourceContext&) = delete; - virtual sal_Int32 SAL_CALL getCurrentCursor( ) - throw( css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCurrentCursor( ) override; - virtual void SAL_CALL setCursor( sal_Int32 cursorId ) - throw( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCursor( sal_Int32 cursorId ) override; - virtual void SAL_CALL setImage( sal_Int32 imageId ) - throw( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setImage( sal_Int32 imageId ) override; - virtual void SAL_CALL transferablesFlavorsChanged( ) - throw( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL transferablesFlavorsChanged( ) override; }; #endif // INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx index 2da380577f55..55f8fc732568 100644 --- a/vcl/osx/DropTarget.cxx +++ b/vcl/osx/DropTarget.cxx @@ -350,7 +350,6 @@ void SAL_CALL DropTarget::disposing() } void SAL_CALL DropTarget::initialize(const Sequence< Any >& aArguments) - throw(Exception, std::exception) { if (aArguments.getLength() < 2) { @@ -387,59 +386,57 @@ SAL_WNODEPRECATED_DECLARATIONS_POP } void SAL_CALL DropTarget::addDropTargetListener(const uno::Reference<XDropTargetListener>& dtl) - throw(RuntimeException, std::exception) { rBHelper.addListener(cppu::UnoType<decltype(dtl)>::get(), dtl); } void SAL_CALL DropTarget::removeDropTargetListener(const uno::Reference<XDropTargetListener>& dtl) - throw(RuntimeException, std::exception) { rBHelper.removeListener(cppu::UnoType<decltype(dtl)>::get(), dtl); } -sal_Bool SAL_CALL DropTarget::isActive( ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL DropTarget::isActive( ) { return mbActive; } -void SAL_CALL DropTarget::setActive(sal_Bool active) throw(RuntimeException, std::exception) +void SAL_CALL DropTarget::setActive(sal_Bool active) { mbActive = active; } -sal_Int8 SAL_CALL DropTarget::getDefaultActions() throw(RuntimeException, std::exception) +sal_Int8 SAL_CALL DropTarget::getDefaultActions() { return mDefaultActions; } -void SAL_CALL DropTarget::setDefaultActions(sal_Int8 actions) throw(RuntimeException, std::exception) +void SAL_CALL DropTarget::setDefaultActions(sal_Int8 actions) { OSL_ENSURE( actions < 8, "No valid default actions"); mDefaultActions= actions; } -void SAL_CALL DropTarget::acceptDrag(sal_Int8 dragOperation) throw (RuntimeException, std::exception) +void SAL_CALL DropTarget::acceptDrag(sal_Int8 dragOperation) { mSelectedDropAction = dragOperation; } -void SAL_CALL DropTarget::rejectDrag() throw (RuntimeException, std::exception) +void SAL_CALL DropTarget::rejectDrag() { mSelectedDropAction = DNDConstants::ACTION_NONE; } -void SAL_CALL DropTarget::acceptDrop(sal_Int8 dropOperation) throw( RuntimeException, std::exception) +void SAL_CALL DropTarget::acceptDrop(sal_Int8 dropOperation) { mSelectedDropAction = dropOperation; } -void SAL_CALL DropTarget::rejectDrop() throw (RuntimeException, std::exception) +void SAL_CALL DropTarget::rejectDrop() { mSelectedDropAction = DNDConstants::ACTION_NONE; } -void SAL_CALL DropTarget::dropComplete(sal_Bool success) throw (RuntimeException, std::exception) +void SAL_CALL DropTarget::dropComplete(sal_Bool success) { // Reset the internal transferable used as shortcut in case this is // an internal D&D operation @@ -529,17 +526,17 @@ void DropTarget::fire_dropActionChanged(const DropTargetDragEvent& dtde) } } -OUString SAL_CALL DropTarget::getImplementationName() throw (RuntimeException, std::exception) +OUString SAL_CALL DropTarget::getImplementationName() { return dropTarget_getImplementationName(); } -sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames( ) { return dropTarget_getSupportedServiceNames(); } diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx index ef0c82b190fd..aafb6449599f 100644 --- a/vcl/osx/DropTarget.hxx +++ b/vcl/osx/DropTarget.hxx @@ -89,35 +89,32 @@ public: virtual void SAL_CALL disposing() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw(css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XDropTarget - virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) override; - virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) override; // Default is not active - virtual sal_Bool SAL_CALL isActive() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActive(sal_Bool isActive) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getDefaultActions() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultActions(sal_Int8 actions) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isActive() override; + virtual void SAL_CALL setActive(sal_Bool isActive) override; + virtual sal_Int8 SAL_CALL getDefaultActions() override; + virtual void SAL_CALL setDefaultActions(sal_Int8 actions) override; // XDropTargetDragContext - virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rejectDrag() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) override; + virtual void SAL_CALL rejectDrag() override; // XDropTargetDragContext - virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rejectDrop() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropComplete(sal_Bool success) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) override; + virtual void SAL_CALL rejectDrop() override; + virtual void SAL_CALL dropComplete(sal_Bool success) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // NSDraggingDestination protocol functions NSDragOperation draggingEntered(id sender); diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx index df39c42206da..32fca10a00a6 100644 --- a/vcl/osx/OSXTransferable.cxx +++ b/vcl/osx/OSXTransferable.cxx @@ -96,7 +96,6 @@ OSXTransferable::~OSXTransferable() } Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) - throw( UnsupportedFlavorException, IOException, RuntimeException, std::exception ) { if (!isValidFlavor(aFlavor) || !isDataFlavorSupported(aFlavor)) { @@ -132,13 +131,11 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) } Sequence< DataFlavor > SAL_CALL OSXTransferable::getTransferDataFlavors( ) - throw( RuntimeException, std::exception ) { return mFlavorList; } sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlavor) - 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 961c9cefe7a4..2e7056145dd1 100644 --- a/vcl/osx/OSXTransferable.hxx +++ b/vcl/osx/OSXTransferable.hxx @@ -47,14 +47,11 @@ public: // XTransferable - virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) - throw( css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override; - virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override; // Helper functions not part of the XTransferable interface diff --git a/vcl/osx/a11ylistener.cxx b/vcl/osx/a11ylistener.cxx index 1d56c1fafa25..018106fd9304 100644 --- a/vcl/osx/a11ylistener.cxx +++ b/vcl/osx/a11ylistener.cxx @@ -61,13 +61,13 @@ AquaA11yEventListener::~AquaA11yEventListener() } void SAL_CALL -AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) +AquaA11yEventListener::disposing( const EventObject& ) { [ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ]; } void SAL_CALL -AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException, std::exception ) +AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) { NSString * notification = nil; id element = m_wrapperObject; diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx index 6095a0123a70..20f5decb4809 100644 --- a/vcl/osx/clipboard.cxx +++ b/vcl/osx/clipboard.cxx @@ -140,7 +140,7 @@ AquaClipboard::~AquaClipboard() [mPasteboard release]; } -Reference<XTransferable> SAL_CALL AquaClipboard::getContents() throw(RuntimeException, std::exception) +Reference<XTransferable> SAL_CALL AquaClipboard::getContents() { MutexGuard aGuard(m_aMutex); @@ -158,7 +158,6 @@ Reference<XTransferable> SAL_CALL AquaClipboard::getContents() throw(RuntimeExce void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransferable, const Reference<XClipboardOwner>& xClipboardOwner) - throw( RuntimeException, std::exception ) { NSArray* types = xTransferable.is() ? mpDataFlavorMapper->flavorSequenceToTypesArray(xTransferable->getTransferDataFlavors()) : @@ -186,18 +185,17 @@ void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransf fireClipboardChangedEvent(); } -OUString SAL_CALL AquaClipboard::getName() throw( RuntimeException, std::exception ) +OUString SAL_CALL AquaClipboard::getName() { return OUString(); } -sal_Int8 SAL_CALL AquaClipboard::getRenderingCapabilities() throw( RuntimeException, std::exception ) +sal_Int8 SAL_CALL AquaClipboard::getRenderingCapabilities() { return 0; } void SAL_CALL AquaClipboard::addClipboardListener(const Reference< XClipboardListener >& listener) - throw( RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); @@ -209,7 +207,6 @@ void SAL_CALL AquaClipboard::addClipboardListener(const Reference< XClipboardLis } void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboardListener >& listener) - throw( RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); @@ -299,7 +296,6 @@ void AquaClipboard::provideDataForType(NSPasteboard* sender, const NSString* typ } void SAL_CALL AquaClipboard::flushClipboard() - throw(RuntimeException, std::exception) { if (mXClipboardContent.is()) { @@ -325,17 +321,17 @@ NSPasteboard* AquaClipboard::getPasteboard() const return mPasteboard; } -OUString SAL_CALL AquaClipboard::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL AquaClipboard::getImplementationName() { return clipboard_getImplementationName(); } -sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL AquaClipboard::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL AquaClipboard::getSupportedServiceNames() { return clipboard_getSupportedServiceNames(); } diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx index 8a45c037b5b3..638eb4e7875b 100644 --- a/vcl/osx/clipboard.hxx +++ b/vcl/osx/clipboard.hxx @@ -87,43 +87,34 @@ public: // XClipboard - virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents() override; virtual void SAL_CALL setContents( const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable, - const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override; - virtual OUString SAL_CALL getName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() override; // XClipboardEx - virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int8 SAL_CALL getRenderingCapabilities() override; // XClipboardNotifier - virtual void SAL_CALL addClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; - virtual void SAL_CALL removeClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; // XFlushableClipboard - virtual void SAL_CALL flushClipboard( ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL flushClipboard( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /* Get a reference to the used pastboard. */ diff --git a/vcl/osx/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx index 3fa2c0b5e03c..3c628d96d27f 100644 --- a/vcl/osx/documentfocuslistener.cxx +++ b/vcl/osx/documentfocuslistener.cxx @@ -36,7 +36,6 @@ DocumentFocusListener::DocumentFocusListener(AquaA11yFocusTracker& rTracker) : void SAL_CALL DocumentFocusListener::disposing( const EventObject& aEvent ) - 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. @@ -46,7 +45,6 @@ DocumentFocusListener::disposing( const EventObject& aEvent ) void SAL_CALL DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent ) - throw( RuntimeException, std::exception ) { try { switch( aEvent.EventId ) @@ -92,7 +90,6 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent ) } Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject& aEvent ) - throw (IndexOutOfBoundsException, RuntimeException) { Reference< XAccessible > xAccessible(aEvent.Source, UNO_QUERY); @@ -118,7 +115,6 @@ Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject& } void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAccessible) - throw (IndexOutOfBoundsException, RuntimeException) { Reference< XAccessibleContext > xContext = xAccessible->getAccessibleContext(); @@ -129,7 +125,7 @@ void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAcc void DocumentFocusListener::attachRecursive( const Reference< XAccessible >& xAccessible, const Reference< XAccessibleContext >& xContext -) throw (IndexOutOfBoundsException, RuntimeException) +) { if( xContext.is() ) { @@ -144,7 +140,7 @@ void DocumentFocusListener::attachRecursive( const Reference< XAccessible >& xAccessible, const Reference< XAccessibleContext >& xContext, const Reference< XAccessibleStateSet >& xStateSet -) throw (IndexOutOfBoundsException,RuntimeException) +) { if( xStateSet->contains(AccessibleStateType::FOCUSED ) ) m_aFocusTracker.setFocusedObject( xAccessible ); @@ -172,7 +168,6 @@ void DocumentFocusListener::attachRecursive( } void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAccessible) - throw (IndexOutOfBoundsException, RuntimeException) { Reference< XAccessibleContext > xContext = xAccessible->getAccessibleContext(); @@ -183,7 +178,7 @@ void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAcc void DocumentFocusListener::detachRecursive( const Reference< XAccessible >& xAccessible, const Reference< XAccessibleContext >& xContext -) throw (IndexOutOfBoundsException, RuntimeException) +) { Reference< XAccessibleStateSet > xStateSet = xContext->getAccessibleStateSet(); @@ -195,7 +190,7 @@ void DocumentFocusListener::detachRecursive( const Reference< XAccessible >&, const Reference< XAccessibleContext >& xContext, const Reference< XAccessibleStateSet >& xStateSet -) throw (IndexOutOfBoundsException, RuntimeException) +) { Reference< XAccessibleEventBroadcaster > xBroadcaster = Reference< XAccessibleEventBroadcaster >(xContext, UNO_QUERY); diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx index 2a06b78cf282..f22f7e371305 100644 --- a/vcl/osx/documentfocuslistener.hxx +++ b/vcl/osx/documentfocuslistener.hxx @@ -41,14 +41,14 @@ public: /// @throws css::uno::RuntimeException void attachRecursive( const css::uno::Reference< css::accessibility::XAccessible >& xAccessible - ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException void attachRecursive( const css::uno::Reference< css::accessibility::XAccessible >& xAccessible, const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext - ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException @@ -56,20 +56,20 @@ public: const css::uno::Reference< css::accessibility::XAccessible >& xAccessible, const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext, const css::uno::Reference< css::accessibility::XAccessibleStateSet >& xStateSet - ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException void detachRecursive( const css::uno::Reference< css::accessibility::XAccessible >& xAccessible - ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException void detachRecursive( const css::uno::Reference< css::accessibility::XAccessible >& xAccessible, const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext - ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException @@ -77,20 +77,17 @@ public: const css::uno::Reference< css::accessibility::XAccessible >& xAccessible, const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext, const css::uno::Reference< css::accessibility::XAccessibleStateSet >& xStateSet - ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - static css::uno::Reference< css::accessibility::XAccessible > getAccessible(const css::lang::EventObject& aEvent ) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + static css::uno::Reference< css::accessibility::XAccessible > getAccessible(const css::lang::EventObject& aEvent ); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override; private: std::set< css::uno::Reference< css::uno::XInterface > > m_aRefList; diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 53ce5c91cbcd..ff3479cdce13 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -249,18 +249,14 @@ private: const sal_Int32 mnBitsPerPixel; // XBitmap - virtual geometry::IntegerSize2D SAL_CALL getSize() throw (uno::RuntimeException, std::exception) override { return maSize; } - virtual sal_Bool SAL_CALL hasAlpha( ) throw (uno::RuntimeException, std::exception) override { return mnBitsPerPixel != 8; } + virtual geometry::IntegerSize2D SAL_CALL getSize() override { return maSize; } + virtual sal_Bool SAL_CALL hasAlpha( ) override { return mnBitsPerPixel != 8; } virtual uno::Reference< rendering::XBitmap > SAL_CALL getScaledBitmap( const geometry::RealSize2D&, - sal_Bool ) throw (uno::RuntimeException, std::exception) override { return this; } + sal_Bool ) override { return this; } // XIntegerReadOnlyBitmap virtual uno::Sequence< ::sal_Int8 > SAL_CALL getData( rendering::IntegerBitmapLayout& bitmapLayout, - const geometry::IntegerRectangle2D& rect ) - throw (lang::IndexOutOfBoundsException, - rendering::VolatileContentDestroyedException, - uno::RuntimeException, - std::exception) override + const geometry::IntegerRectangle2D& rect ) override { CPPUNIT_ASSERT_MESSAGE( "X1 out of bounds", rect.X1 >= 0 ); CPPUNIT_ASSERT_MESSAGE( "Y1 out of bounds", rect.Y1 >= 0 ); @@ -305,18 +301,14 @@ private: } virtual uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( rendering::IntegerBitmapLayout&, - const geometry::IntegerPoint2D& ) - throw (lang::IndexOutOfBoundsException, - rendering::VolatileContentDestroyedException, - uno::RuntimeException, - std::exception) override + const geometry::IntegerPoint2D& ) override { CPPUNIT_ASSERT_MESSAGE("getPixel: method not implemented", false); return uno::Sequence< sal_Int8 >(); } /// @throws uno::RuntimeException - uno::Reference< rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (uno::RuntimeException) + uno::Reference< rendering::XBitmapPalette > SAL_CALL getPalette( ) { uno::Reference< XBitmapPalette > aRet; if( mnBitsPerPixel == 8 ) @@ -324,7 +316,7 @@ private: return aRet; } - virtual rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (uno::RuntimeException, std::exception) override + virtual rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) override { rendering::IntegerBitmapLayout aLayout( maLayout ); @@ -340,7 +332,7 @@ private: } // XBitmapPalette - virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getNumberOfEntries() override { CPPUNIT_ASSERT_MESSAGE( "Got palette getNumberOfEntries interface call without handing out palette", getPalette().is() ); @@ -349,10 +341,7 @@ private: } virtual sal_Bool SAL_CALL getIndex( uno::Sequence< double >& entry, - ::sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, - std::exception) override + ::sal_Int32 nIndex ) override { CPPUNIT_ASSERT_MESSAGE( "Got palette getIndex interface call without handing out palette", getPalette().is() ); @@ -368,10 +357,7 @@ private: virtual sal_Bool SAL_CALL setIndex( const uno::Sequence< double >&, sal_Bool, - ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, - lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + ::sal_Int32 nIndex ) override { CPPUNIT_ASSERT_MESSAGE( "Got palette setIndex interface call without handing out palette", getPalette().is()); @@ -389,7 +375,7 @@ private: } }; - virtual uno::Reference< rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< rendering::XColorSpace > SAL_CALL getColorSpace( ) override { // this is the method from XBitmapPalette. Return palette color // space here @@ -397,129 +383,100 @@ private: } // XIntegerBitmapColorSpace - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getType( ) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) override { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) override { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties() - throw (uno::RuntimeException, - std::exception) override + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties() override { CPPUNIT_ASSERT_MESSAGE("getProperties: method not implemented", false ); return uno::Sequence< ::beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >&, - const uno::Reference< rendering::XColorSpace >& ) - throw (uno::RuntimeException, - std::exception) override + const uno::Reference< rendering::XColorSpace >& ) override { CPPUNIT_ASSERT_MESSAGE("convertColorSpace: method not implemented", false); return uno::Sequence< double >(); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& ) override { CPPUNIT_ASSERT_MESSAGE("convertToRGB: method not implemented", false); return uno::Sequence< rendering::RGBColor >(); } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& ) override { CPPUNIT_ASSERT_MESSAGE("convertToARGB: method not implemented", false); return uno::Sequence< rendering::ARGBColor >(); } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& ) override { CPPUNIT_ASSERT_MESSAGE("convertToPARGB: method not implemented", false); return uno::Sequence< rendering::ARGBColor >(); } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& ) override { CPPUNIT_ASSERT_MESSAGE("convertFromRGB: method not implemented", false); return uno::Sequence< double >(); } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& ) override { CPPUNIT_ASSERT_MESSAGE("convertFromARGB: this method is not expected to be called!", false); return uno::Sequence< double >(); } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) override { CPPUNIT_ASSERT_MESSAGE("convertFromPARGB: this method is not expected to be called!", false); return uno::Sequence< double >(); } - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) override { return mnBitsPerPixel; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) override { return maComponentBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getEndianness( ) override { return util::Endianness::LITTLE; } virtual uno::Sequence< double > SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& , - const uno::Reference< rendering::XColorSpace >& ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + const uno::Reference< rendering::XColorSpace >& ) override { CPPUNIT_ASSERT_MESSAGE("convertFromIntegerColorSpace: method not implemented", false); return uno::Sequence< double >(); } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& , - const uno::Reference< rendering::XIntegerBitmapColorSpace >& ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + const uno::Reference< rendering::XIntegerBitmapColorSpace >& ) override { CPPUNIT_ASSERT_MESSAGE("convertToIntegerColorSpace: method not implemented", false); return uno::Sequence< sal_Int8 >(); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const uno::Sequence< rendering::ARGBColor > aTemp( convertIntegerToARGB(deviceColor) ); const std::size_t nLen(aTemp.getLength()); @@ -535,8 +492,7 @@ private: return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const std::size_t nLen( deviceColor.getLength() ); const sal_Int32 nBytesPerPixel(mnBitsPerPixel == 8 ? 1 : 4); @@ -573,10 +529,7 @@ private: } virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( - const uno::Sequence< ::sal_Int8 >& deviceColor) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + const uno::Sequence< ::sal_Int8 >& deviceColor) override { const std::size_t nLen( deviceColor.getLength() ); const sal_Int32 nBytesPerPixel(mnBitsPerPixel == 8 ? 1 : 4); @@ -614,27 +567,19 @@ private: } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( - const uno::Sequence< rendering::RGBColor >&) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + const uno::Sequence< rendering::RGBColor >&) override { CPPUNIT_ASSERT_MESSAGE("convertIntegerFromRGB: method not implemented", false); return uno::Sequence< sal_Int8 >(); } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& ) override { CPPUNIT_ASSERT_MESSAGE("convertIntegerFromARGB: method not implemented", false); return uno::Sequence< sal_Int8 >(); } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) override { CPPUNIT_ASSERT_MESSAGE("convertIntegerFromPARGB: method not implemented", false); return uno::Sequence< sal_Int8 >(); diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx index 4ea7fe1b8584..49edd7d47294 100644 --- a/vcl/source/app/dndhelp.cxx +++ b/vcl/source/app/dndhelp.cxx @@ -26,38 +26,26 @@ using namespace ::com::sun::star; vcl::unohelper::DragAndDropClient::~DragAndDropClient() {} void vcl::unohelper::DragAndDropClient::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& /*dge*/ ) - throw (css::uno::RuntimeException, - std::exception) { } void vcl::unohelper::DragAndDropClient::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& /*dsde*/ ) - throw (css::uno::RuntimeException, - std::exception) { } void vcl::unohelper::DragAndDropClient::drop( const css::datatransfer::dnd::DropTargetDropEvent& /*dtde*/ ) - throw (css::uno::RuntimeException, - std::exception) { } void vcl::unohelper::DragAndDropClient::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& /*dtdee*/ ) - throw (css::uno::RuntimeException, - std::exception) { } void vcl::unohelper::DragAndDropClient::dragExit( const css::datatransfer::dnd::DropTargetEvent& /*dte*/ ) - throw (css::uno::RuntimeException, - std::exception) { } void vcl::unohelper::DragAndDropClient::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& /*dtde*/ ) - throw (css::uno::RuntimeException, - std::exception) { } @@ -71,7 +59,7 @@ vcl::unohelper::DragAndDropWrapper::~DragAndDropWrapper() } // uno::XInterface -uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< css::lang::XEventListener* >( static_cast<css::datatransfer::dnd::XDragGestureListener*>(this)) ), @@ -82,7 +70,7 @@ uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & r } // css::lang::XEventListener -void vcl::unohelper::DragAndDropWrapper::disposing( const css::lang::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::disposing( const css::lang::EventObject& rEvent ) { // Empty Source means it's the client, because the client is not a XInterface if ( !rEvent.Source.is() ) @@ -90,61 +78,61 @@ void vcl::unohelper::DragAndDropWrapper::disposing( const css::lang::EventObject } // css::datatransfer::dnd::XDragGestureListener -void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw (css::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) { if ( mpClient ) mpClient->dragGestureRecognized( rDGE ); } // css::datatransfer::dnd::XDragSourceListener -void vcl::unohelper::DragAndDropWrapper::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (css::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ) { if ( mpClient ) mpClient->dragDropEnd( rDSDE ); } -void vcl::unohelper::DragAndDropWrapper::dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& ) throw (css::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& ) { } -void vcl::unohelper::DragAndDropWrapper::dragExit( const css::datatransfer::dnd::DragSourceEvent& ) throw (css::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragExit( const css::datatransfer::dnd::DragSourceEvent& ) { } -void vcl::unohelper::DragAndDropWrapper::dragOver( const css::datatransfer::dnd::DragSourceDragEvent& ) throw (css::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragOver( const css::datatransfer::dnd::DragSourceDragEvent& ) { } -void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& ) throw (css::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& ) { } // css::datatransfer::dnd::XDropTargetListener -void vcl::unohelper::DragAndDropWrapper::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) { if ( mpClient ) mpClient->drop( rDTDE ); } -void vcl::unohelper::DragAndDropWrapper::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (css::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) { if ( mpClient ) mpClient->dragEnter( rDTDEE ); } -void vcl::unohelper::DragAndDropWrapper::dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) { if ( mpClient ) mpClient->dragExit( dte ); } -void vcl::unohelper::DragAndDropWrapper::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) { if ( mpClient ) mpClient->dragOver( rDTDE ); } -void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) throw (css::uno::RuntimeException, std::exception) +void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) { } diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 2dc15b157b1c..fd8ef606bdd7 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -75,12 +75,12 @@ class VCLSession: virtual ~VCLSession() override {} - virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) override; - virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ) override; - virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) override; - virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) override; - virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) override; + virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) override; + virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) override; + virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) override; + virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) override; + virtual sal_Bool SAL_CALL cancelShutdown() override; void SAL_CALL disposing() override; @@ -252,7 +252,7 @@ void VCLSession::SalSessionEventProc( void* pData, SalSessionEvent* pEvent ) } } -void SAL_CALL VCLSession::addSessionManagerListener( const css::uno::Reference<XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL VCLSession::addSessionManagerListener( const css::uno::Reference<XSessionManagerListener>& xListener ) { SAL_INFO("vcl.se", "VCLSession::addSessionManagerListener" ); @@ -262,7 +262,7 @@ void SAL_CALL VCLSession::addSessionManagerListener( const css::uno::Reference<X m_aListeners.push_back( Listener( xListener ) ); } -void SAL_CALL VCLSession::removeSessionManagerListener( const css::uno::Reference<XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL VCLSession::removeSessionManagerListener( const css::uno::Reference<XSessionManagerListener>& xListener ) { SAL_INFO("vcl.se", "VCLSession::removeSessionManagerListener" ); @@ -282,7 +282,7 @@ void SAL_CALL VCLSession::removeSessionManagerListener( const css::uno::Referenc } } -void SAL_CALL VCLSession::queryInteraction( const css::uno::Reference<XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL VCLSession::queryInteraction( const css::uno::Reference<XSessionManagerListener>& xListener ) { SAL_INFO("vcl.se", "VCLSession::queryInteraction"); @@ -314,7 +314,7 @@ void SAL_CALL VCLSession::queryInteraction( const css::uno::Reference<XSessionMa } } -void SAL_CALL VCLSession::interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL VCLSession::interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) { SAL_INFO("vcl.se", "VCLSession::interactionDone"); @@ -342,7 +342,7 @@ void SAL_CALL VCLSession::interactionDone( const css::uno::Reference< XSessionMa } } -void SAL_CALL VCLSession::saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL VCLSession::saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) { SAL_INFO("vcl.se", "VCLSession::saveDone"); @@ -367,7 +367,7 @@ void SAL_CALL VCLSession::saveDone( const css::uno::Reference< XSessionManagerLi } } -sal_Bool SAL_CALL VCLSession::cancelShutdown() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL VCLSession::cancelShutdown() { SAL_INFO("vcl.se", "VCLSession::cancelShutdown"); diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index d398d6bc2562..294847ef45a3 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -237,14 +237,13 @@ public: : m_xNextContext( ctx ) {} // XCurrentContext - virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name ) override; private: css::uno::Reference< css::uno::XCurrentContext > m_xNextContext; }; -uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Name) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Name) { uno::Any retVal; @@ -342,12 +341,11 @@ namespace */ class VCLUnoWrapperDeleter : public cppu::WeakImplHelper<css::lang::XEventListener> { - virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(lang::EventObject const& rSource) override; }; void VCLUnoWrapperDeleter::disposing(lang::EventObject const& /* rSource */) - 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 3d98b1219a58..d721fd4f42e4 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -62,14 +62,14 @@ namespace vcl { namespace unohelper { } // css::uno::XInterface - uno::Any TextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) + uno::Any TextDataObject::queryInterface( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< datatransfer::XTransferable* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } // css::datatransfer::XTransferable - uno::Any TextDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor ) throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception) + uno::Any TextDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor ) { uno::Any aAny; @@ -85,14 +85,14 @@ namespace vcl { namespace unohelper { return aAny; } - uno::Sequence< datatransfer::DataFlavor > TextDataObject::getTransferDataFlavors( ) throw(uno::RuntimeException, std::exception) + uno::Sequence< datatransfer::DataFlavor > TextDataObject::getTransferDataFlavors( ) { uno::Sequence< datatransfer::DataFlavor > aDataFlavors(1); SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aDataFlavors.getArray()[0] ); return aDataFlavors; } - sal_Bool TextDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor ) throw(uno::RuntimeException, std::exception) + sal_Bool TextDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor ) { SotClipboardFormatId nT = SotExchange::GetFormat( rFlavor ); return ( nT == SotClipboardFormatId::STRING ); diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index fcdf217c25d3..91c8d4b3f929 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -73,9 +73,9 @@ public: * XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static Sequence< OUString > getSupportedServiceNames_static(); @@ -83,34 +83,28 @@ public: * XClipboard */ - virtual Reference< css::datatransfer::XTransferable > SAL_CALL getContents() - throw(RuntimeException, std::exception) override; + virtual Reference< css::datatransfer::XTransferable > SAL_CALL getContents() override; virtual void SAL_CALL setContents( const Reference< css::datatransfer::XTransferable >& xTrans, - const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw(RuntimeException, std::exception) override; + const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override; - virtual OUString SAL_CALL getName() - throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; /* * XClipboardEx */ - virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw(RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL getRenderingCapabilities() override; /* * XClipboardNotifier */ virtual void SAL_CALL addClipboardListener( - const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException, std::exception) override; + const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; virtual void SAL_CALL removeClipboardListener( - const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException, std::exception) override; + const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; }; Sequence< OUString > GenericClipboard::getSupportedServiceNames_static() @@ -119,22 +113,22 @@ Sequence< OUString > GenericClipboard::getSupportedServiceNames_static() return aRet; } -OUString GenericClipboard::getImplementationName() throw( RuntimeException, std::exception ) +OUString GenericClipboard::getImplementationName() { return OUString("com.sun.star.datatransfer.VCLGenericClipboard"); } -Sequence< OUString > GenericClipboard::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > GenericClipboard::getSupportedServiceNames() { return getSupportedServiceNames_static(); } -sal_Bool GenericClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) +sal_Bool GenericClipboard::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Reference< css::datatransfer::XTransferable > GenericClipboard::getContents() throw( RuntimeException, std::exception ) +Reference< css::datatransfer::XTransferable > GenericClipboard::getContents() { return m_aContents; } @@ -142,7 +136,6 @@ Reference< css::datatransfer::XTransferable > GenericClipboard::getContents() th void GenericClipboard::setContents( const Reference< css::datatransfer::XTransferable >& xTrans, const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw( RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); Reference< datatransfer::clipboard::XClipboardOwner > xOldOwner( m_aOwner ); @@ -165,18 +158,17 @@ void GenericClipboard::setContents( } } -OUString GenericClipboard::getName() throw( RuntimeException, std::exception ) +OUString GenericClipboard::getName() { return OUString( "CLIPBOARD" ); } -sal_Int8 GenericClipboard::getRenderingCapabilities() throw( RuntimeException, std::exception ) +sal_Int8 GenericClipboard::getRenderingCapabilities() { return 0; } void GenericClipboard::addClipboardListener( const Reference< datatransfer::clipboard::XClipboardListener >& listener ) - throw( RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -184,7 +176,6 @@ void GenericClipboard::addClipboardListener( const Reference< datatransfer::clip } void GenericClipboard::removeClipboardListener( const Reference< datatransfer::clipboard::XClipboardListener >& listener ) - throw( RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -202,8 +193,8 @@ public: /* * XSingleServiceFactory */ - virtual Reference< XInterface > SAL_CALL createInstance() throw(std::exception) override; - virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(std::exception) override; + virtual Reference< XInterface > SAL_CALL createInstance() override; + virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) override; }; ClipboardFactory::ClipboardFactory() : @@ -213,12 +204,12 @@ ClipboardFactory::ClipboardFactory() : { } -Reference< XInterface > ClipboardFactory::createInstance() throw(std::exception) +Reference< XInterface > ClipboardFactory::createInstance() { return createInstanceWithArguments( Sequence< Any >() ); } -Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Sequence< Any >& arguments ) throw(std::exception) +Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Sequence< Any >& arguments ) { SolarMutexGuard aGuard; Reference< XInterface > xResult = ImplGetSVData()->mpDefInst->CreateClipboard( arguments ); @@ -257,28 +248,25 @@ public: GenericDragSource() : WeakComponentImplHelper( m_aMutex ) {} // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) override; + virtual sal_Bool SAL_CALL isDragImageSupported() override; + virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) override; 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(std::exception) override; + ) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( css::uno::Exception, std::exception ) override; + virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.datatransfer.dnd.VclGenericDragSource"); } - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { return getSupportedServiceNames_static(); } static Sequence< OUString > getSupportedServiceNames_static() @@ -288,12 +276,12 @@ public: } }; -sal_Bool GenericDragSource::isDragImageSupported() throw(std::exception) +sal_Bool GenericDragSource::isDragImageSupported() { return false; } -sal_Int32 GenericDragSource::getDefaultCursor( sal_Int8 ) throw(std::exception) +sal_Int32 GenericDragSource::getDefaultCursor( sal_Int8 ) { return 0; } @@ -302,7 +290,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(std::exception) + ) { datatransfer::dnd::DragSourceDropEvent aEv; aEv.DropAction = datatransfer::dnd::DNDConstants::ACTION_COPY; @@ -310,7 +298,7 @@ void GenericDragSource::startDrag( const datatransfer::dnd::DragGestureEvent&, listener->dragDropEnd( aEv ); } -void GenericDragSource::initialize( const Sequence< Any >& ) throw( Exception, std::exception ) +void GenericDragSource::initialize( const Sequence< Any >& ) { } @@ -359,26 +347,23 @@ public: {} // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception, std::exception ) override; + virtual void SAL_CALL initialize( const Sequence< Any >& args ) override; // XDropTarget - virtual void SAL_CALL addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; - virtual void SAL_CALL removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; - virtual sal_Bool SAL_CALL isActive() throw(std::exception) override; - virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception) override; - virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception) override; - virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception) override; - - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) override; + virtual void SAL_CALL removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) override; + virtual sal_Bool SAL_CALL isActive() override; + virtual void SAL_CALL setActive( sal_Bool active ) override; + virtual sal_Int8 SAL_CALL getDefaultActions() override; + virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) override; + + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.datatransfer.dnd.VclGenericDropTarget"); } - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { return getSupportedServiceNames_static(); } static Sequence< OUString > getSupportedServiceNames_static() @@ -388,33 +373,33 @@ public: } }; -void GenericDropTarget::initialize( const Sequence< Any >& ) throw( Exception, std::exception ) +void GenericDropTarget::initialize( const Sequence< Any >& ) { } -void GenericDropTarget::addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) +void GenericDropTarget::addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) { } -void GenericDropTarget::removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) +void GenericDropTarget::removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) { } -sal_Bool GenericDropTarget::isActive() throw(std::exception) +sal_Bool GenericDropTarget::isActive() { return false; } -void GenericDropTarget::setActive( sal_Bool ) throw(std::exception) +void GenericDropTarget::setActive( sal_Bool ) { } -sal_Int8 GenericDropTarget::getDefaultActions() throw(std::exception) +sal_Int8 GenericDropTarget::getDefaultActions() { return 0; } -void GenericDropTarget::setDefaultActions( sal_Int8) throw(std::exception) +void GenericDropTarget::setDefaultActions( sal_Int8) { } diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index 9568c4c846cb..3d99129b933e 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -52,19 +52,19 @@ public: FontIdentificator() {} // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& ) throw (Exception, RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const Sequence< Any >& ) override; // XMaterialHolder - virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception) override; + virtual Any SAL_CALL getMaterial() override; }; -void SAL_CALL FontIdentificator::initialize( const Sequence<Any>& i_rArgs ) throw(Exception,RuntimeException, std::exception) +void SAL_CALL FontIdentificator::initialize( const Sequence<Any>& i_rArgs ) { if( !ImplGetSVData() ) return; // VCL not initialized @@ -82,7 +82,7 @@ void SAL_CALL FontIdentificator::initialize( const Sequence<Any>& i_rArgs ) thro } } -Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException, std::exception) +Any SAL_CALL FontIdentificator::getMaterial() { if( !ImplGetSVData() ) return Any(); // VCL not initialized @@ -163,17 +163,17 @@ Reference< XInterface > SAL_CALL FontIdentificator_createInstance( const Referen } // XServiceInfo -OUString SAL_CALL FontIdentificator::getImplementationName() throw (RuntimeException, std::exception) +OUString SAL_CALL FontIdentificator::getImplementationName() { return FontIdentificator_getImplementationName(); } -sal_Bool SAL_CALL FontIdentificator::supportsService( const OUString& i_rServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL FontIdentificator::supportsService( const OUString& i_rServiceName ) { return cppu::supportsService(this, i_rServiceName); } -Sequence< OUString > SAL_CALL FontIdentificator::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL FontIdentificator::getSupportedServiceNames() { return FontIdentificator_getSupportedServiceNames(); } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index f6ca2cc0bcb0..f228b8e81f6a 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2816,7 +2816,7 @@ VclPtr<PopupMenu> Edit::CreatePopupMenu() } // css::datatransfer::dnd::XDragGestureListener -void Edit::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw (css::uno::RuntimeException, std::exception) +void Edit::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) { SolarMutexGuard aVclGuard; @@ -2853,7 +2853,7 @@ void Edit::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent } // css::datatransfer::dnd::XDragSourceListener -void Edit::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (css::uno::RuntimeException, std::exception) +void Edit::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ) { SolarMutexGuard aVclGuard; @@ -2879,7 +2879,7 @@ void Edit::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE } // css::datatransfer::dnd::XDropTargetListener -void Edit::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) +void Edit::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) { SolarMutexGuard aVclGuard; @@ -2926,7 +2926,7 @@ void Edit::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) thro rDTDE.Context->dropComplete( bChanges ); } -void Edit::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) +void Edit::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDE ) { if ( !mpDDInfo ) { @@ -2948,14 +2948,14 @@ void Edit::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rD } } -void Edit::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw (css::uno::RuntimeException, std::exception) +void Edit::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) { SolarMutexGuard aVclGuard; ImplHideDDCursor(); } -void Edit::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) +void Edit::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) { SolarMutexGuard aVclGuard; diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx index 78d14c593208..770cf1ee41d1 100644 --- a/vcl/source/control/notebookbar.cxx +++ b/vcl/source/control/notebookbar.cxx @@ -24,11 +24,9 @@ public: explicit NotebookBarContextChangeEventListener(NotebookBar *p) : mpParent(p) {} // XContextChangeEventListener - virtual void SAL_CALL notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent) override; - virtual void SAL_CALL disposing(const ::css::lang::EventObject&) - throw (::css::uno::RuntimeException, ::std::exception) override; + virtual void SAL_CALL disposing(const ::css::lang::EventObject&) override; }; @@ -121,7 +119,6 @@ void NotebookBar::SetSystemWindow(SystemWindow* pSystemWindow) } void SAL_CALL NotebookBarContextChangeEventListener::notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { if (mpParent && mpParent->m_pContextContainer) mpParent->m_pContextContainer->SetContext(vcl::EnumContext::GetContextEnum(rEvent.ContextName)); @@ -129,7 +126,6 @@ void SAL_CALL NotebookBarContextChangeEventListener::notifyContextChangeEvent(co void SAL_CALL NotebookBarContextChangeEventListener::disposing(const ::css::lang::EventObject&) - throw (::css::uno::RuntimeException, ::std::exception) { mpParent.clear(); } diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 08627478b8e7..e738f34777d2 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -74,14 +74,14 @@ public: SvMemoryStream& GetHTMLStream() { return maHTMLStream; } // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } // css::datatransfer::XTransferable - css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override; + css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) override; + sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override; }; TETextDataObject::TETextDataObject( const OUString& rText ) : maText( rText ) @@ -89,14 +89,14 @@ TETextDataObject::TETextDataObject( const OUString& rText ) : maText( rText ) } // css::uno::XInterface -css::uno::Any TETextDataObject::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any TETextDataObject::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< css::datatransfer::XTransferable* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } // css::datatransfer::XTransferable -css::uno::Any TETextDataObject::getTransferData( const css::datatransfer::DataFlavor& rFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) +css::uno::Any TETextDataObject::getTransferData( const css::datatransfer::DataFlavor& rFlavor ) { css::uno::Any aAny; @@ -122,7 +122,7 @@ css::uno::Any TETextDataObject::getTransferData( const css::datatransfer::DataFl return aAny; } -css::uno::Sequence< css::datatransfer::DataFlavor > TETextDataObject::getTransferDataFlavors( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::datatransfer::DataFlavor > TETextDataObject::getTransferDataFlavors( ) { GetHTMLStream().Seek( STREAM_SEEK_TO_END ); bool bHTML = GetHTMLStream().Tell() > 0; @@ -133,7 +133,7 @@ css::uno::Sequence< css::datatransfer::DataFlavor > TETextDataObject::getTransfe return aDataFlavors; } -sal_Bool TETextDataObject::isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) throw(css::uno::RuntimeException, std::exception) +sal_Bool TETextDataObject::isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) { SotClipboardFormatId nT = SotExchange::GetFormat( rFlavor ); return ( nT == SotClipboardFormatId::STRING ); @@ -1889,7 +1889,7 @@ bool TextView::ImplCheckTextLen( const OUString& rNewText ) return bOK; } -void TextView::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw (css::uno::RuntimeException, std::exception) +void TextView::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) { if ( mpImpl->mbClickedInSelection ) { @@ -1935,13 +1935,13 @@ void TextView::dragGestureRecognized( const css::datatransfer::dnd::DragGestureE } } -void TextView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& ) throw (css::uno::RuntimeException, std::exception) +void TextView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& ) { ImpHideDDCursor(); mpImpl->mpDDInfo.reset(); } -void TextView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) +void TextView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) { SolarMutexGuard aVclGuard; @@ -2047,17 +2047,17 @@ void TextView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) rDTDE.Context->dropComplete( bChanges ); } -void TextView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& ) throw (css::uno::RuntimeException, std::exception) +void TextView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& ) { } -void TextView::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw (css::uno::RuntimeException, std::exception) +void TextView::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) { SolarMutexGuard aVclGuard; ImpHideDDCursor(); } -void TextView::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception) +void TextView::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) { SolarMutexGuard aVclGuard; diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index 33f0aa966183..8067a1ee2256 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -117,7 +117,6 @@ OUString FilterConfigCache::FilterConfigCacheEntry::GetShortName() @throws It let pass RuntimeExceptions only. */ Reference< XInterface > openConfig(const char* sPackage) - throw(RuntimeException) { Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 50506fe955a0..4bf9efce66fa 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -90,13 +90,11 @@ 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, std::exception) override + virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& rData ) override { mrStm.WriteBytes(rData.getConstArray(), rData.getLength()); } - virtual void SAL_CALL flush() - throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL flush() override { mrStm.Flush(); } - virtual void SAL_CALL closeOutput() throw(std::exception) override {} + virtual void SAL_CALL closeOutput() override {} public: diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index a4f2fe0f1cb3..6bb422880592 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -8058,13 +8058,13 @@ class PDFStreamIf : public: explicit PDFStreamIf( PDFWriterImpl* pWriter ) : m_pWriter( pWriter ), m_bWrite( true ) {} - virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) override; - virtual void SAL_CALL flush() throw(std::exception) override; - virtual void SAL_CALL closeOutput() throw(std::exception) override; + virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override; + virtual void SAL_CALL flush() override; + virtual void SAL_CALL closeOutput() override; }; } -void SAL_CALL PDFStreamIf::writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) +void SAL_CALL PDFStreamIf::writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) { if( m_bWrite && aData.getLength() ) { @@ -8073,11 +8073,11 @@ void SAL_CALL PDFStreamIf::writeBytes( const css::uno::Sequence< sal_Int8 >& aD } } -void SAL_CALL PDFStreamIf::flush() throw(std::exception) +void SAL_CALL PDFStreamIf::flush() { } -void SAL_CALL PDFStreamIf::closeOutput() throw(std::exception) +void SAL_CALL PDFStreamIf::closeOutput() { m_bWrite = false; } diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 8afd8b70cdc0..a06b9b945da2 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -1126,7 +1126,7 @@ public: } // XMaterialHolder - virtual uno::Any SAL_CALL getMaterial() throw(std::exception) override + virtual uno::Any SAL_CALL getMaterial() override { return uno::makeAny( sal_Int64(maID) ); } diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index cbf05245d343..a3015fb5e91a 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -425,20 +425,20 @@ VclCanvasBitmap::~VclCanvasBitmap() } // XBitmap -geometry::IntegerSize2D SAL_CALL VclCanvasBitmap::getSize() throw (uno::RuntimeException, std::exception) +geometry::IntegerSize2D SAL_CALL VclCanvasBitmap::getSize() { SolarMutexGuard aGuard; return integerSize2DFromSize( m_aBitmap.GetSizePixel() ); } -sal_Bool SAL_CALL VclCanvasBitmap::hasAlpha() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VclCanvasBitmap::hasAlpha() { SolarMutexGuard aGuard; return m_aBmpEx.IsTransparent(); } uno::Reference< rendering::XBitmap > SAL_CALL VclCanvasBitmap::getScaledBitmap( const geometry::RealSize2D& newSize, - sal_Bool beFast ) throw (uno::RuntimeException, std::exception) + sal_Bool beFast ) { SolarMutexGuard aGuard; @@ -449,9 +449,7 @@ uno::Reference< rendering::XBitmap > SAL_CALL VclCanvasBitmap::getScaledBitmap( // XIntegerReadOnlyBitmap uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getData( rendering::IntegerBitmapLayout& bitmapLayout, - const geometry::IntegerRectangle2D& rect ) throw( lang::IndexOutOfBoundsException, - rendering::VolatileContentDestroyedException, - uno::RuntimeException, std::exception) + const geometry::IntegerRectangle2D& rect ) { SolarMutexGuard aGuard; @@ -554,9 +552,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, std::exception) + const geometry::IntegerPoint2D& pos ) { SolarMutexGuard aGuard; @@ -622,7 +618,7 @@ uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getPixel( rendering::Integer return aRet; } -uno::Reference< rendering::XBitmapPalette > SAL_CALL VclCanvasBitmap::getPalette() throw (uno::RuntimeException) +uno::Reference< rendering::XBitmapPalette > SAL_CALL VclCanvasBitmap::getPalette() { SolarMutexGuard aGuard; @@ -633,7 +629,7 @@ uno::Reference< rendering::XBitmapPalette > SAL_CALL VclCanvasBitmap::getPalette return aRet; } -rendering::IntegerBitmapLayout SAL_CALL VclCanvasBitmap::getMemoryLayout() throw (uno::RuntimeException, std::exception) +rendering::IntegerBitmapLayout SAL_CALL VclCanvasBitmap::getMemoryLayout() { SolarMutexGuard aGuard; @@ -650,7 +646,7 @@ rendering::IntegerBitmapLayout SAL_CALL VclCanvasBitmap::getMemoryLayout() throw return aLayout; } -sal_Int32 SAL_CALL VclCanvasBitmap::getNumberOfEntries() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL VclCanvasBitmap::getNumberOfEntries() { SolarMutexGuard aGuard; @@ -660,7 +656,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, std::exception) +sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, sal_Int32 nIndex ) { SolarMutexGuard aGuard; @@ -681,7 +677,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, s return 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, std::exception) +sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal_Bool, sal_Int32 nIndex ) { SolarMutexGuard aGuard; @@ -708,36 +704,36 @@ namespace }; } -uno::Reference< rendering::XColorSpace > SAL_CALL VclCanvasBitmap::getColorSpace( ) throw (uno::RuntimeException, std::exception) +uno::Reference< rendering::XColorSpace > SAL_CALL VclCanvasBitmap::getColorSpace( ) { // this is the method from XBitmapPalette. Return palette color // space here return PaletteColorSpaceHolder::get(); } -sal_Int8 SAL_CALL VclCanvasBitmap::getType( ) throw (uno::RuntimeException, std::exception) +sal_Int8 SAL_CALL VclCanvasBitmap::getType( ) { return rendering::ColorSpaceType::RGB; } -uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::getComponentTags( ) throw (uno::RuntimeException, std::exception) +uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::getComponentTags( ) { SolarMutexGuard aGuard; return m_aComponentTags; } -sal_Int8 SAL_CALL VclCanvasBitmap::getRenderingIntent( ) throw (uno::RuntimeException, std::exception) +sal_Int8 SAL_CALL VclCanvasBitmap::getRenderingIntent( ) { return rendering::RenderingIntent::PERCEPTUAL; } -uno::Sequence< ::beans::PropertyValue > SAL_CALL VclCanvasBitmap::getProperties( ) throw (uno::RuntimeException, std::exception) +uno::Sequence< ::beans::PropertyValue > SAL_CALL VclCanvasBitmap::getProperties( ) { 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, std::exception) + const uno::Reference< ::rendering::XColorSpace >& targetColorSpace ) { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -746,7 +742,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, std::exception) +uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertToRGB( const uno::Sequence< double >& deviceColor ) { SolarMutexGuard aGuard; @@ -795,7 +791,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, std::exception) +uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToARGB( const uno::Sequence< double >& deviceColor ) { SolarMutexGuard aGuard; @@ -848,7 +844,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, std::exception) +uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToPARGB( const uno::Sequence< double >& deviceColor ) { SolarMutexGuard aGuard; @@ -901,7 +897,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, std::exception) +uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromRGB( const uno::Sequence<rendering::RGBColor>& rgbColor ) { SolarMutexGuard aGuard; @@ -941,7 +937,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, std::exception) +uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) { SolarMutexGuard aGuard; @@ -981,7 +977,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, std::exception) +uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromPARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) { SolarMutexGuard aGuard; @@ -1023,26 +1019,26 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromPARGB( const uno::S return aRes; } -sal_Int32 SAL_CALL VclCanvasBitmap::getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL VclCanvasBitmap::getBitsPerPixel( ) { SolarMutexGuard aGuard; return m_nBitsPerOutputPixel; } -uno::Sequence< ::sal_Int32 > SAL_CALL VclCanvasBitmap::getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) +uno::Sequence< ::sal_Int32 > SAL_CALL VclCanvasBitmap::getComponentBitCounts( ) { SolarMutexGuard aGuard; return m_aComponentBitCounts; } -sal_Int8 SAL_CALL VclCanvasBitmap::getEndianness( ) throw (uno::RuntimeException, std::exception) +sal_Int8 SAL_CALL VclCanvasBitmap::getEndianness( ) { 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, std::exception) + const uno::Reference< ::rendering::XColorSpace >& targetColorSpace ) { if( dynamic_cast<VclCanvasBitmap*>(targetColorSpace.get()) ) { @@ -1106,7 +1102,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, std::exception) + const uno::Reference< ::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) { if( dynamic_cast<VclCanvasBitmap*>(targetColorSpace.get()) ) { @@ -1123,7 +1119,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, std::exception) +uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) { SolarMutexGuard aGuard; @@ -1175,7 +1171,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, std::exception) +uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) { SolarMutexGuard aGuard; @@ -1230,7 +1226,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, std::exception) +uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) { SolarMutexGuard aGuard; @@ -1286,7 +1282,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, std::exception) +uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromRGB( const uno::Sequence<rendering::RGBColor>& rgbColor ) { SolarMutexGuard aGuard; @@ -1335,7 +1331,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, std::exception) +uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) { SolarMutexGuard aGuard; @@ -1384,7 +1380,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, std::exception) +uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromPARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) { SolarMutexGuard aGuard; diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index b66ec69a6ea0..3dd1df22c791 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -428,25 +428,24 @@ namespace vcl private: uno::Sequence< sal_Int8 > m_aComponentTags; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getType( ) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) override { return m_aComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) override { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) override { 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, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -454,7 +453,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, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -471,7 +470,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -488,7 +487,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -505,7 +504,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -522,7 +521,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -539,7 +538,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx index 7a844c607300..f1578151fb56 100644 --- a/vcl/source/helper/commandinfoprovider.cxx +++ b/vcl/source/helper/commandinfoprovider.cxx @@ -58,8 +58,7 @@ namespace mxFrame->addFrameActionListener(this); } - virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) override { // The same frame can be reused for a different component, e.g. // starting component from the start center, so need to re-init the cached data. @@ -71,8 +70,7 @@ namespace if (mxFrame.is()) mxFrame->removeFrameActionListener(this); } - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (RuntimeException, std::exception) override + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override { (void)rEvent; mrInfoProvider.SetFrame(nullptr); diff --git a/vcl/source/helper/displayconnectiondispatch.cxx b/vcl/source/helper/displayconnectiondispatch.cxx index 77c9dab8d3b1..60851598ba08 100644 --- a/vcl/source/helper/displayconnectiondispatch.cxx +++ b/vcl/source/helper/displayconnectiondispatch.cxx @@ -73,35 +73,35 @@ void DisplayConnectionDispatch::terminate() (*it)->handleEvent( aEvent ); } -void SAL_CALL DisplayConnectionDispatch::addEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler, sal_Int32 /*eventMask*/ ) throw(std::exception) +void SAL_CALL DisplayConnectionDispatch::addEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler, sal_Int32 /*eventMask*/ ) { MutexGuard aGuard( m_aMutex ); m_aHandlers.push_back( handler ); } -void SAL_CALL DisplayConnectionDispatch::removeEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler ) throw(std::exception) +void SAL_CALL DisplayConnectionDispatch::removeEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler ) { MutexGuard aGuard( m_aMutex ); m_aHandlers.remove( handler ); } -void SAL_CALL DisplayConnectionDispatch::addErrorHandler( const css::uno::Reference< XEventHandler >& handler ) throw(std::exception) +void SAL_CALL DisplayConnectionDispatch::addErrorHandler( const css::uno::Reference< XEventHandler >& handler ) { MutexGuard aGuard( m_aMutex ); m_aErrorHandlers.push_back( handler ); } -void SAL_CALL DisplayConnectionDispatch::removeErrorHandler( const css::uno::Reference< XEventHandler >& handler ) throw(std::exception) +void SAL_CALL DisplayConnectionDispatch::removeErrorHandler( const css::uno::Reference< XEventHandler >& handler ) { MutexGuard aGuard( m_aMutex ); m_aErrorHandlers.remove( handler ); } -Any SAL_CALL DisplayConnectionDispatch::getIdentifier() throw(std::exception) +Any SAL_CALL DisplayConnectionDispatch::getIdentifier() { return m_aAny; } diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx index 6506c058fd6f..9907e7bc4ecc 100644 --- a/vcl/source/uitest/uno/uiobject_uno.cxx +++ b/vcl/source/uitest/uno/uiobject_uno.cxx @@ -25,7 +25,6 @@ UIObjectUnoObj::~UIObjectUnoObj() } css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UIObjectUnoObj::getChild(const OUString& rID) - throw (css::uno::RuntimeException, std::exception) { if (!mpObj) throw css::uno::RuntimeException(); @@ -36,7 +35,6 @@ css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UIObjectUnoObj::getChild( } void SAL_CALL UIObjectUnoObj::executeAction(const OUString& rAction, const css::uno::Sequence<css::beans::PropertyValue>& rPropValues) - throw (css::uno::RuntimeException, std::exception) { if (!mpObj) throw css::uno::RuntimeException(); @@ -55,7 +53,6 @@ void SAL_CALL UIObjectUnoObj::executeAction(const OUString& rAction, const css:: } css::uno::Sequence<css::beans::PropertyValue> UIObjectUnoObj::getState() - throw (css::uno::RuntimeException, std::exception) { if (!mpObj) throw css::uno::RuntimeException(); @@ -74,7 +71,6 @@ css::uno::Sequence<css::beans::PropertyValue> UIObjectUnoObj::getState() } css::uno::Sequence<OUString> UIObjectUnoObj::getChildren() - throw (css::uno::RuntimeException, std::exception) { if (!mpObj) throw css::uno::RuntimeException(); @@ -92,7 +88,6 @@ css::uno::Sequence<OUString> UIObjectUnoObj::getChildren() } OUString SAL_CALL UIObjectUnoObj::getType() - throw (css::uno::RuntimeException, std::exception) { if (!mpObj) throw css::uno::RuntimeException(); @@ -101,19 +96,16 @@ OUString SAL_CALL UIObjectUnoObj::getType() } OUString SAL_CALL UIObjectUnoObj::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("org.libreoffice.uitest.UIObject"); } sal_Bool UIObjectUnoObj::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> UIObjectUnoObj::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence<OUString> aServiceNames(1); aServiceNames[0] = "com.sun.star.ui.test.UIObject"; diff --git a/vcl/source/uitest/uno/uiobject_uno.hxx b/vcl/source/uitest/uno/uiobject_uno.hxx index d06e6691272d..510c22c16631 100644 --- a/vcl/source/uitest/uno/uiobject_uno.hxx +++ b/vcl/source/uitest/uno/uiobject_uno.hxx @@ -37,29 +37,21 @@ public: explicit UIObjectUnoObj(std::unique_ptr<UIObject> pObj); virtual ~UIObjectUnoObj() override; - css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getChild(const OUString& rID) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getChild(const OUString& rID) override; - void SAL_CALL executeAction(const OUString& rAction, const css::uno::Sequence<css::beans::PropertyValue>& xPropValues) - throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL executeAction(const OUString& rAction, const css::uno::Sequence<css::beans::PropertyValue>& xPropValues) override; - css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getState() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getState() override; - css::uno::Sequence<OUString> SAL_CALL getChildren() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getChildren() override; - OUString SAL_CALL getType() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getType() override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; #endif diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx index 4840934e8d13..aad296e9b604 100644 --- a/vcl/source/uitest/uno/uitest_uno.cxx +++ b/vcl/source/uitest/uno/uitest_uno.cxx @@ -38,20 +38,15 @@ public: UITestUnoObj(); - void SAL_CALL executeCommand(const OUString& rCommand) - throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL executeCommand(const OUString& rCommand) override; - css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getTopFocusWindow() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getTopFocusWindow() override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; UITestUnoObj::UITestUnoObj(): @@ -61,14 +56,12 @@ UITestUnoObj::UITestUnoObj(): } void SAL_CALL UITestUnoObj::executeCommand(const OUString& rCommand) - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; UITest::executeCommand(rCommand); } css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UITestUnoObj::getTopFocusWindow() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::unique_ptr<UIObject> pObj = UITest::getFocusTopWindow(); @@ -76,19 +69,16 @@ css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UITestUnoObj::getTopFocus } OUString SAL_CALL UITestUnoObj::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("org.libreoffice.uitest.UITest"); } sal_Bool UITestUnoObj::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> UITestUnoObj::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence<OUString> aServiceNames(1); aServiceNames[0] = "com.sun.star.ui.test.UITest"; diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx index e02d8fc0e8fd..5fce2982d5f9 100644 --- a/vcl/source/window/dndeventdispatcher.cxx +++ b/vcl/source/window/dndeventdispatcher.cxx @@ -86,7 +86,6 @@ void DNDEventDispatcher::designate_currentwindow(vcl::Window *pWindow) } void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) - throw(RuntimeException, std::exception) { osl::MutexGuard aImplGuard( m_aMutex ); @@ -122,7 +121,6 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) } void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtdee ) - throw(RuntimeException, std::exception) { osl::MutexGuard aImplGuard( m_aMutex ); Point location( dtdee.LocationX, dtdee.LocationY ); @@ -146,7 +144,6 @@ void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtd } void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ ) - throw(RuntimeException, std::exception) { osl::MutexGuard aImplGuard( m_aMutex ); @@ -158,7 +155,6 @@ void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ ) } void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) - throw(RuntimeException, std::exception) { osl::MutexGuard aImplGuard( m_aMutex ); @@ -195,7 +191,6 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) } void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& dtde ) - throw(RuntimeException, std::exception) { osl::MutexGuard aImplGuard( m_aMutex ); @@ -232,7 +227,6 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& } void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& dge ) - throw(RuntimeException, std::exception) { osl::MutexGuard aImplGuard( m_aMutex ); @@ -244,15 +238,14 @@ void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& } void SAL_CALL DNDEventDispatcher::disposing( const EventObject& ) - throw(RuntimeException, std::exception) { } -void SAL_CALL DNDEventDispatcher::acceptDrag( sal_Int8 /*dropAction*/ ) throw(RuntimeException, std::exception) +void SAL_CALL DNDEventDispatcher::acceptDrag( sal_Int8 /*dropAction*/ ) { } -void SAL_CALL DNDEventDispatcher::rejectDrag() throw(RuntimeException, std::exception) +void SAL_CALL DNDEventDispatcher::rejectDrag() { } @@ -260,7 +253,6 @@ sal_Int32 DNDEventDispatcher::fireDragEnterEvent( vcl::Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions, const Sequence< DataFlavor >& aFlavorList ) - throw(RuntimeException) { sal_Int32 n = 0; @@ -292,7 +284,6 @@ sal_Int32 DNDEventDispatcher::fireDragOverEvent( vcl::Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions ) - throw(RuntimeException) { sal_Int32 n = 0; @@ -317,7 +308,7 @@ sal_Int32 DNDEventDispatcher::fireDragOverEvent( vcl::Window *pWindow, return n; } -sal_Int32 DNDEventDispatcher::fireDragExitEvent( vcl::Window *pWindow ) throw(RuntimeException) +sal_Int32 DNDEventDispatcher::fireDragExitEvent( vcl::Window *pWindow ) { sal_Int32 n = 0; @@ -344,7 +335,6 @@ sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( vcl::Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions ) - throw(RuntimeException) { sal_Int32 n = 0; @@ -373,7 +363,6 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( vcl::Window *pWindow, const Reference< XDropTargetDropContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions, const Reference< XTransferable >& xTransferable ) - throw(RuntimeException) { sal_Int32 n = 0; @@ -412,7 +401,6 @@ sal_Int32 DNDEventDispatcher::fireDragGestureEvent( vcl::Window *pWindow, const Reference< XDragSource >& xSource, const Any& event, const Point& rOrigin, const sal_Int8 nDragAction ) - throw(css::uno::RuntimeException) { sal_Int32 n = 0; diff --git a/vcl/source/window/dndlistenercontainer.cxx b/vcl/source/window/dndlistenercontainer.cxx index b9874fc08086..fd0244c6e014 100644 --- a/vcl/source/window/dndlistenercontainer.cxx +++ b/vcl/source/window/dndlistenercontainer.cxx @@ -36,54 +36,45 @@ DNDListenerContainer::~DNDListenerContainer() } void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDragGestureListener >& dgl ) - throw(RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType<XDragGestureListener>::get(), dgl ); } void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< XDragGestureListener >& dgl ) - throw(RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<XDragGestureListener>::get(), dgl ); } void SAL_CALL DNDListenerContainer::resetRecognizer( ) - throw(RuntimeException, std::exception) { } void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDropTargetListener >& dtl ) - throw(RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType<XDropTargetListener>::get(), dtl ); } void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< XDropTargetListener >& dtl ) - throw(RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<XDropTargetListener>::get(), dtl ); } sal_Bool SAL_CALL DNDListenerContainer::isActive( ) - throw(RuntimeException, std::exception) { return m_bActive; } void SAL_CALL DNDListenerContainer::setActive( sal_Bool active ) - throw(RuntimeException, std::exception) { m_bActive = active; } sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions( ) - throw(RuntimeException, std::exception) { return m_nDefaultActions; } void SAL_CALL DNDListenerContainer::setDefaultActions( sal_Int8 actions ) - throw(RuntimeException, std::exception) { m_nDefaultActions = actions; } @@ -423,7 +414,7 @@ sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_ return nRet; } -void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw (RuntimeException, std::exception) +void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) { if( m_xDropTargetDragContext.is() ) { @@ -432,23 +423,23 @@ void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw ( } } -void SAL_CALL DNDListenerContainer::rejectDrag( ) throw (RuntimeException, std::exception) +void SAL_CALL DNDListenerContainer::rejectDrag( ) { // nothing to do here } -void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation ) throw (RuntimeException, std::exception) +void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation ) { if( m_xDropTargetDropContext.is() ) m_xDropTargetDropContext->acceptDrop( dropOperation ); } -void SAL_CALL DNDListenerContainer::rejectDrop( ) throw (RuntimeException, std::exception) +void SAL_CALL DNDListenerContainer::rejectDrop( ) { // nothing to do here } -void SAL_CALL DNDListenerContainer::dropComplete( sal_Bool success ) throw (RuntimeException, std::exception) +void SAL_CALL DNDListenerContainer::dropComplete( sal_Bool success ) { if( m_xDropTargetDropContext.is() ) { diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index 6e9f5678a3ba..6f9e4de03856 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -133,7 +133,6 @@ void X11Clipboard::clearContents() } Reference< XTransferable > SAL_CALL X11Clipboard::getContents() - throw(RuntimeException, std::exception) { MutexGuard aGuard(m_rSelectionManager.getMutex()); @@ -145,7 +144,6 @@ Reference< XTransferable > SAL_CALL X11Clipboard::getContents() void SAL_CALL X11Clipboard::setContents( const Reference< XTransferable >& xTrans, const Reference< XClipboardOwner >& xClipboardOwner ) - throw(RuntimeException, std::exception) { // remember old values for callbacks before setting the new ones. ClearableMutexGuard aGuard(m_rSelectionManager.getMutex()); @@ -176,26 +174,22 @@ void SAL_CALL X11Clipboard::setContents( } OUString SAL_CALL X11Clipboard::getName() - throw(RuntimeException, std::exception) { return m_rSelectionManager.getString( m_aSelection ); } sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities() - throw(RuntimeException, std::exception) { return RenderingCapabilities::Delayed; } void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardListener >& listener ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( m_rSelectionManager.getMutex() ); m_aListeners.push_back( listener ); } void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboardListener >& listener ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( m_rSelectionManager.getMutex() ); m_aListeners.remove( listener ); @@ -222,19 +216,16 @@ Reference< XInterface > X11Clipboard::getReference() throw() } OUString SAL_CALL X11Clipboard::getImplementationName( ) - throw(RuntimeException, std::exception) { return OUString(X11_CLIPBOARD_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL X11Clipboard::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL X11Clipboard::getSupportedServiceNames( ) - 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 b3d06f4f6f55..c9a948cefd99 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -66,47 +66,38 @@ namespace x11 { * XServiceInfo */ - virtual OUString SAL_CALL getImplementationName( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; /* * XClipboard */ - virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents() override; virtual void SAL_CALL setContents( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans, - const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override; - virtual OUString SAL_CALL getName() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; /* * XClipboardEx */ - virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL getRenderingCapabilities() override; /* * XClipboardNotifier */ virtual void SAL_CALL addClipboardListener( - const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; virtual void SAL_CALL removeClipboardListener( - const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; /* * SelectionAdaptor diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx index 375bdea01538..3f923d4b0e95 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.cxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx @@ -42,17 +42,17 @@ DropTargetDropContext::~DropTargetDropContext() { } -void DropTargetDropContext::acceptDrop( sal_Int8 dragOperation ) throw(std::exception) +void DropTargetDropContext::acceptDrop( sal_Int8 dragOperation ) { m_rManager.accept( dragOperation, m_aDropWindow, m_nTimestamp ); } -void DropTargetDropContext::rejectDrop() throw(std::exception) +void DropTargetDropContext::rejectDrop() { m_rManager.reject( m_aDropWindow, m_nTimestamp ); } -void DropTargetDropContext::dropComplete( sal_Bool success ) throw(std::exception) +void DropTargetDropContext::dropComplete( sal_Bool success ) { m_rManager.dropComplete( success, m_aDropWindow, m_nTimestamp ); } @@ -76,12 +76,12 @@ DropTargetDragContext::~DropTargetDragContext() { } -void DropTargetDragContext::acceptDrag( sal_Int8 dragOperation ) throw(std::exception) +void DropTargetDragContext::acceptDrag( sal_Int8 dragOperation ) { m_rManager.accept( dragOperation, m_aDropWindow, m_nTimestamp ); } -void DropTargetDragContext::rejectDrag() throw(std::exception) +void DropTargetDragContext::rejectDrag() { m_rManager.reject( m_aDropWindow, m_nTimestamp ); } @@ -105,21 +105,21 @@ DragSourceContext::~DragSourceContext() { } -sal_Int32 DragSourceContext::getCurrentCursor() throw(std::exception) +sal_Int32 DragSourceContext::getCurrentCursor() { return m_rManager.getCurrentCursor(); } -void DragSourceContext::setCursor( sal_Int32 cursorId ) throw(std::exception) +void DragSourceContext::setCursor( sal_Int32 cursorId ) { m_rManager.setCursor( cursorId, m_aDropWindow, m_nTimestamp ); } -void DragSourceContext::setImage( sal_Int32 ) throw(std::exception) +void DragSourceContext::setImage( sal_Int32 ) { } -void DragSourceContext::transferablesFlavorsChanged() throw(std::exception) +void DragSourceContext::transferablesFlavorsChanged() { m_rManager.transferablesFlavorsChanged(); } diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx index d4ff95a500d3..93b493daaf4c 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx @@ -44,9 +44,9 @@ namespace x11 { virtual ~DropTargetDropContext() override; // XDropTargetDropContext - virtual void SAL_CALL acceptDrop( sal_Int8 dragOperation ) throw(std::exception) override; - virtual void SAL_CALL rejectDrop() throw(std::exception) override; - virtual void SAL_CALL dropComplete( sal_Bool success ) throw(std::exception) override; + virtual void SAL_CALL acceptDrop( sal_Int8 dragOperation ) override; + virtual void SAL_CALL rejectDrop() override; + virtual void SAL_CALL dropComplete( sal_Bool success ) override; }; class DropTargetDragContext : @@ -61,8 +61,8 @@ namespace x11 { virtual ~DropTargetDragContext() override; // XDropTargetDragContext - virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw(std::exception) override; - virtual void SAL_CALL rejectDrag() throw(std::exception) override; + virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) override; + virtual void SAL_CALL rejectDrag() override; }; class DragSourceContext : @@ -77,10 +77,10 @@ namespace x11 { virtual ~DragSourceContext() override; // XDragSourceContext - virtual sal_Int32 SAL_CALL getCurrentCursor() throw(std::exception) override; - virtual void SAL_CALL setCursor( sal_Int32 cursorId ) throw(std::exception) override; - virtual void SAL_CALL setImage( sal_Int32 imageId ) throw(std::exception) override; - virtual void SAL_CALL transferablesFlavorsChanged() throw(std::exception) override; + virtual sal_Int32 SAL_CALL getCurrentCursor() override; + virtual void SAL_CALL setCursor( sal_Int32 cursorId ) override; + virtual void SAL_CALL setImage( sal_Int32 imageId ) override; + virtual void SAL_CALL transferablesFlavorsChanged() override; }; } // namespace diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx index 3915d8e46762..3ed63ec7ef1b 100644 --- a/vcl/unx/generic/dtrans/X11_droptarget.cxx +++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx @@ -45,7 +45,7 @@ DropTarget::~DropTarget() m_xSelectionManager->deregisterDropTarget( m_aTargetWindow ); } -void DropTarget::initialize( const Sequence< Any >& arguments ) throw( css::uno::Exception, std::exception ) +void DropTarget::initialize( const Sequence< Any >& arguments ) { if( arguments.getLength() > 1 ) { @@ -72,38 +72,38 @@ void DropTarget::initialize( const Sequence< Any >& arguments ) throw( css::uno: } } -void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception) +void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener ) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); m_aListeners.push_back( xListener ); } -void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception) +void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener ) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); m_aListeners.remove( xListener ); } -sal_Bool DropTarget::isActive() throw(std::exception) +sal_Bool DropTarget::isActive() { return m_bActive; } -void DropTarget::setActive( sal_Bool active ) throw(std::exception) +void DropTarget::setActive( sal_Bool active ) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); m_bActive = active; } -sal_Int8 DropTarget::getDefaultActions() throw(std::exception) +sal_Int8 DropTarget::getDefaultActions() { return m_nDefaultActions; } -void DropTarget::setDefaultActions( sal_Int8 actions ) throw(std::exception) +void DropTarget::setDefaultActions( sal_Int8 actions ) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -159,17 +159,17 @@ void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw() } // XServiceInfo -OUString DropTarget::getImplementationName() throw(std::exception) +OUString DropTarget::getImplementationName() { return OUString(XDND_DROPTARGET_IMPLEMENTATION_NAME); } -sal_Bool DropTarget::supportsService( const OUString& ServiceName ) throw(std::exception) +sal_Bool DropTarget::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > DropTarget::getSupportedServiceNames() throw(std::exception) +Sequence< OUString > DropTarget::getSupportedServiceNames() { return Xdnd_dropTarget_getSupportedServiceNames(); } diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 2f578f2dd611..af2cd43947ac 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -315,7 +315,7 @@ Cursor SelectionManager::createCursor( const unsigned char* pPointerData, const return aCursor; } -void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (css::uno::Exception, std::exception) +void SelectionManager::initialize( const Sequence< Any >& arguments ) { osl::MutexGuard aGuard(m_aMutex); @@ -2869,12 +2869,12 @@ void SelectionManager::reject( ::Window aDropWindow, Time ) * XDragSource */ -sal_Bool SelectionManager::isDragImageSupported() throw(std::exception) +sal_Bool SelectionManager::isDragImageSupported() { return false; } -sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) +sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) { Cursor aCursor = m_aNoneCursor; if( dragAction & DNDConstants::ACTION_MOVE ) @@ -3118,7 +3118,7 @@ void SelectionManager::startDrag( sal_Int32, const css::uno::Reference< XTransferable >& transferable, const css::uno::Reference< XDragSourceListener >& listener - ) throw(std::exception) + ) { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "startDrag( sourceActions = %x )\n", (int)sourceActions ); @@ -3767,7 +3767,6 @@ void SelectionManager::shutdown() throw() } sal_Bool SelectionManager::handleEvent(const Any& event) - throw (css::uno::RuntimeException, std::exception) { Sequence< sal_Int8 > aSeq; if( (event >>= aSeq) ) @@ -3803,14 +3802,12 @@ sal_Bool SelectionManager::handleEvent(const Any& event) } void SAL_CALL SelectionManager::disposing( const css::lang::EventObject& rEvt ) - throw( css::uno::RuntimeException, std::exception ) { if (rEvt.Source == m_xDesktop || rEvt.Source == m_xDisplayConnection) shutdown(); } void SAL_CALL SelectionManager::queryTermination( const css::lang::EventObject& ) - throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception ) { } @@ -3820,7 +3817,6 @@ void SAL_CALL SelectionManager::queryTermination( const css::lang::EventObject& * has been called before vcl is shutdown */ void SAL_CALL SelectionManager::notifyTermination( const css::lang::EventObject& rEvent ) - throw( css::uno::RuntimeException, std::exception ) { disposing(rEvent); } @@ -3987,7 +3983,7 @@ SelectionManagerHolder::~SelectionManagerHolder() { } -void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( css::uno::Exception, std::exception ) +void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) { OUString aDisplayName; @@ -4011,12 +4007,12 @@ void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) thro * XDragSource */ -sal_Bool SelectionManagerHolder::isDragImageSupported() throw(std::exception) +sal_Bool SelectionManagerHolder::isDragImageSupported() { return m_xRealDragSource.is() && m_xRealDragSource->isDragImageSupported(); } -sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) +sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) { return m_xRealDragSource.is() ? m_xRealDragSource->getDefaultCursor( dragAction ) : 0; } @@ -4026,7 +4022,7 @@ void SelectionManagerHolder::startDrag( sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const css::uno::Reference< css::datatransfer::XTransferable >& transferable, const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener - ) throw(std::exception) + ) { if( m_xRealDragSource.is() ) m_xRealDragSource->startDrag( trigger, sourceActions, cursor, image, transferable, listener ); @@ -4036,17 +4032,17 @@ void SelectionManagerHolder::startDrag( * XServiceInfo */ -OUString SelectionManagerHolder::getImplementationName() throw(std::exception) +OUString SelectionManagerHolder::getImplementationName() { return OUString(XDND_IMPLEMENTATION_NAME); } -sal_Bool SelectionManagerHolder::supportsService( const OUString& ServiceName ) throw(std::exception) +sal_Bool SelectionManagerHolder::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SelectionManagerHolder::getSupportedServiceNames() throw(std::exception) +Sequence< OUString > SelectionManagerHolder::getSupportedServiceNames() { return Xdnd_getSupportedServiceNames(); } diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 24de1bc580a6..ef1449e8daf6 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -90,21 +90,21 @@ namespace x11 { void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(); // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& args ) throw ( css::uno::Exception, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& args ) override; // XDropTarget - virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; - virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; - virtual sal_Bool SAL_CALL isActive() throw(std::exception) override; - virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception) override; - virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception) override; - virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception) override; + virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& ) override; + virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& ) override; + virtual sal_Bool SAL_CALL isActive() override; + virtual void SAL_CALL setActive( sal_Bool active ) override; + virtual sal_Int8 SAL_CALL getDefaultActions() override; + virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > - SAL_CALL getSupportedServiceNames() throw(std::exception) override; + SAL_CALL getSupportedServiceNames() override; }; class SelectionManagerHolder : @@ -122,23 +122,23 @@ namespace x11 { virtual ~SelectionManagerHolder() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > - SAL_CALL getSupportedServiceNames() throw(std::exception) override; + SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& arguments ) throw( css::uno::Exception, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& arguments ) override; // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) override; + virtual sal_Bool SAL_CALL isDragImageSupported() override; + virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) override; virtual void SAL_CALL startDrag( const css::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const css::uno::Reference< css::datatransfer::XTransferable >& transferable, const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener - ) throw(std::exception) override; + ) override; }; @@ -464,21 +464,20 @@ namespace x11 { void shutdown() throw(); // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& arguments ) throw( css::uno::Exception, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& arguments ) override; // XEventHandler - virtual sal_Bool SAL_CALL handleEvent(const css::uno::Any& event) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL handleEvent(const css::uno::Any& event) override; // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) override; + virtual sal_Bool SAL_CALL isDragImageSupported() override; + virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) override; virtual void SAL_CALL startDrag( const css::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const css::uno::Reference< css::datatransfer::XTransferable >& transferable, const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener - ) throw(std::exception) override; + ) override; // SelectionAdaptor for XdndSelection Drag (we are drag source) virtual css::uno::Reference< css::datatransfer::XTransferable > getTransferable() throw() override; @@ -487,13 +486,11 @@ namespace x11 { virtual css::uno::Reference< css::uno::XInterface > getReference() throw() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) - throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) override; }; css::uno::Sequence< OUString > SAL_CALL Xdnd_getSupportedServiceNames(); diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index 9e6714c2aa45..b042152c244d 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -44,7 +44,6 @@ X11Transferable::~X11Transferable() } Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) - throw(UnsupportedFlavorException, IOException, RuntimeException, std::exception) { Any aRet; Sequence< sal_Int8 > aData; @@ -71,7 +70,6 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) } Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() - throw(RuntimeException, std::exception) { Sequence< DataFlavor > aFlavorList; bool bSuccess = m_rManager.getPasteDataTypes( m_aSelection ? m_aSelection : XA_PRIMARY, aFlavorList ); @@ -82,7 +80,6 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() } sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFlavor ) - throw(RuntimeException, std::exception) { if( aFlavor.DataType != cppu::UnoType<Sequence< sal_Int8 >>::get() ) { diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx index 7fa9b5509208..2ce30541a8d3 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.hxx +++ b/vcl/unx/generic/dtrans/X11_transferable.hxx @@ -40,17 +40,11 @@ namespace x11 { * XTransferable */ - virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) - throw(css::datatransfer::UnsupportedFlavorException, - css::io::IOException, - css::uno::RuntimeException, std::exception - ) override; + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override; - virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override; }; } // namespace diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx index 3dc2fea35c72..faadc4091ba4 100644 --- a/vcl/unx/gtk/a11y/atkaction.cxx +++ b/vcl/unx/gtk/a11y/atkaction.cxx @@ -45,7 +45,7 @@ getAsConst( const OString& rString ) /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleAction> - getAction( AtkAction *action ) throw (uno::RuntimeException) + getAction( AtkAction *action ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( action ); diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx index 84ab86b0c87a..54e664b5ae39 100644 --- a/vcl/unx/gtk/a11y/atkcomponent.cxx +++ b/vcl/unx/gtk/a11y/atkcomponent.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star; /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleComponent> - getComponent( AtkComponent *pComponent ) throw (uno::RuntimeException) + getComponent( AtkComponent *pComponent ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pComponent ); if (pWrap) diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx index d7dda03a5321..070ee28ffa74 100644 --- a/vcl/unx/gtk/a11y/atkeditabletext.cxx +++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleEditableText> - getEditableText( AtkEditableText *pEditableText ) throw (uno::RuntimeException) + getEditableText( AtkEditableText *pEditableText ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pEditableText ); if (pWrap) diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index 4a10b3c82733..356262feb4cb 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -191,7 +191,7 @@ hyper_link_get_type() /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleHypertext> - getHypertext( AtkHypertext *pHypertext ) throw (uno::RuntimeException) + getHypertext( AtkHypertext *pHypertext ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pHypertext ); if (pWrap) diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx index 88897210fb2a..404871f1d3a9 100644 --- a/vcl/unx/gtk/a11y/atkimage.cxx +++ b/vcl/unx/gtk/a11y/atkimage.cxx @@ -37,7 +37,7 @@ getAsConst( const OUString& rString ) /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleImage> - getImage( AtkImage *pImage ) throw (uno::RuntimeException) + getImage( AtkImage *pImage ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pImage ); if (pWrap) diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx index 2901bcb73ecf..48dc6e83a895 100644 --- a/vcl/unx/gtk/a11y/atklistener.cxx +++ b/vcl/unx/gtk/a11y/atklistener.cxx @@ -93,7 +93,7 @@ extern "C" { } // XEventListener implementation -void AtkListener::disposing( const lang::EventObject& ) throw (uno::RuntimeException, std::exception) +void AtkListener::disposing( const lang::EventObject& ) { if( mpWrapper ) { @@ -420,7 +420,7 @@ void printNotifyEvent( const accessibility::AccessibleEventObject& rEvent ) #endif -void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException, std::exception ) +void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) { if( !mpWrapper ) return; diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx index fccf03181c37..39d5075c8822 100644 --- a/vcl/unx/gtk/a11y/atklistener.hxx +++ b/vcl/unx/gtk/a11y/atklistener.hxx @@ -33,12 +33,10 @@ public: explicit AtkListener(AtkObjectWrapper * pWrapper); // XEventListener - virtual void disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void disposing( const css::lang::EventObject& Source ) override; // XAccessibleEventListener - virtual void notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override; private: diff --git a/vcl/unx/gtk/a11y/atkselection.cxx b/vcl/unx/gtk/a11y/atkselection.cxx index 39bf065cbb37..b6d2a711fa66 100644 --- a/vcl/unx/gtk/a11y/atkselection.cxx +++ b/vcl/unx/gtk/a11y/atkselection.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star; /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleSelection> - getSelection( AtkSelection *pSelection ) throw (uno::RuntimeException) + getSelection( AtkSelection *pSelection ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pSelection ); if (pWrap) diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx index 26fdef1659b2..a39110a61b16 100644 --- a/vcl/unx/gtk/a11y/atktable.cxx +++ b/vcl/unx/gtk/a11y/atktable.cxx @@ -50,7 +50,7 @@ getAsConst( const OUString& rString ) /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleTable> - getTable( AtkTable *pTable ) throw (uno::RuntimeException) + getTable( AtkTable *pTable ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pTable ); if (pWrap) diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx index b08edd1fa18f..6dc3ca3692d8 100644 --- a/vcl/unx/gtk/a11y/atktext.cxx +++ b/vcl/unx/gtk/a11y/atktext.cxx @@ -135,7 +135,7 @@ adjust_boundaries( css::uno::Reference<css::accessibility::XAccessibleText> cons /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleText> - getText( AtkText *pText ) throw (uno::RuntimeException) + getText( AtkText *pText ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText ); if (pWrap) @@ -152,7 +152,7 @@ static css::uno::Reference<css::accessibility::XAccessibleText> /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleTextMarkup> - getTextMarkup( AtkText *pText ) throw (uno::RuntimeException) + getTextMarkup( AtkText *pText ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText ); if (pWrap) @@ -169,7 +169,7 @@ static css::uno::Reference<css::accessibility::XAccessibleTextMarkup> /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleTextAttributes> - getTextAttributes( AtkText *pText ) throw (uno::RuntimeException) + getTextAttributes( AtkText *pText ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText ); if (pWrap) @@ -186,7 +186,7 @@ static css::uno::Reference<css::accessibility::XAccessibleTextAttributes> /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleMultiLineText> - getMultiLineText( AtkText *pText ) throw (uno::RuntimeException) + getMultiLineText( AtkText *pText ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText ); if (pWrap) diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 4fa1afb42266..75971173f978 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -209,7 +209,7 @@ String2Float( uno::Any& rAny, const gchar * value ) /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleComponent> - getComponent( AtkText *pText ) throw (uno::RuntimeException) + getComponent( AtkText *pText ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText ); if (pWrap) diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index da165245be0b..c386e8b89899 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -143,14 +143,14 @@ public: /// @throws uno::RuntimeException void attachRecursive( const uno::Reference< accessibility::XAccessible >& xAccessible - ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException); + ); /// @trhows lang::IndexOutOfBoundsException /// @throws uno::RuntimeException void attachRecursive( const uno::Reference< accessibility::XAccessible >& xAccessible, const uno::Reference< accessibility::XAccessibleContext >& xContext - ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException); + ); /// @trhows lang::IndexOutOfBoundsException /// @throws uno::RuntimeException @@ -158,20 +158,20 @@ public: const uno::Reference< accessibility::XAccessible >& xAccessible, const uno::Reference< accessibility::XAccessibleContext >& xContext, const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet - ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException); + ); /// @trhows lang::IndexOutOfBoundsException /// @throws uno::RuntimeException void detachRecursive( const uno::Reference< accessibility::XAccessible >& xAccessible - ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException); + ); /// @trhows lang::IndexOutOfBoundsException /// @throws uno::RuntimeException void detachRecursive( const uno::Reference< accessibility::XAccessible >& xAccessible, const uno::Reference< accessibility::XAccessibleContext >& xContext - ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException); + ); /// @trhows lang::IndexOutOfBoundsException /// @throws uno::RuntimeException @@ -179,24 +179,22 @@ public: const uno::Reference< accessibility::XAccessible >& xAccessible, const uno::Reference< accessibility::XAccessibleContext >& xContext, const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet - ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException); + ); /// @trhows lang::IndexOutOfBoundsException /// @throws uno::RuntimeException - static uno::Reference< accessibility::XAccessible > getAccessible(const lang::EventObject& aEvent ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException); + static uno::Reference< accessibility::XAccessible > getAccessible(const lang::EventObject& aEvent ); // XEventListener - virtual void disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override; + virtual void disposing( const lang::EventObject& Source ) override; // XAccessibleEventListener - virtual void notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override; + virtual void notifyEvent( const accessibility::AccessibleEventObject& aEvent ) override; }; /*****************************************************************************/ void DocumentFocusListener::disposing( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { // Unref the object here, but do not remove as listener since the object @@ -209,7 +207,6 @@ void DocumentFocusListener::disposing( const lang::EventObject& aEvent ) /*****************************************************************************/ void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) - throw( uno::RuntimeException, std::exception ) { try { switch( aEvent.EventId ) @@ -254,7 +251,6 @@ void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObj /*****************************************************************************/ uno::Reference< accessibility::XAccessible > DocumentFocusListener::getAccessible(const lang::EventObject& aEvent ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { uno::Reference< accessibility::XAccessible > xAccessible(aEvent.Source, uno::UNO_QUERY); @@ -283,7 +279,7 @@ uno::Reference< accessibility::XAccessible > DocumentFocusListener::getAccessibl void DocumentFocusListener::attachRecursive( const uno::Reference< accessibility::XAccessible >& xAccessible -) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +) { uno::Reference< accessibility::XAccessibleContext > xContext = xAccessible->getAccessibleContext(); @@ -297,7 +293,7 @@ void DocumentFocusListener::attachRecursive( void DocumentFocusListener::attachRecursive( const uno::Reference< accessibility::XAccessible >& xAccessible, const uno::Reference< accessibility::XAccessibleContext >& xContext -) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +) { uno::Reference< accessibility::XAccessibleStateSet > xStateSet = xContext->getAccessibleStateSet(); @@ -312,7 +308,7 @@ void DocumentFocusListener::attachRecursive( const uno::Reference< accessibility::XAccessible >& xAccessible, const uno::Reference< accessibility::XAccessibleContext >& xContext, const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet -) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +) { if( xStateSet->contains(accessibility::AccessibleStateType::FOCUSED ) ) atk_wrapper_focus_tracker_notify_when_idle( xAccessible ); @@ -347,7 +343,7 @@ void DocumentFocusListener::attachRecursive( void DocumentFocusListener::detachRecursive( const uno::Reference< accessibility::XAccessible >& xAccessible -) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +) { uno::Reference< accessibility::XAccessibleContext > xContext = xAccessible->getAccessibleContext(); @@ -361,7 +357,7 @@ void DocumentFocusListener::detachRecursive( void DocumentFocusListener::detachRecursive( const uno::Reference< accessibility::XAccessible >& xAccessible, const uno::Reference< accessibility::XAccessibleContext >& xContext -) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +) { uno::Reference< accessibility::XAccessibleStateSet > xStateSet = xContext->getAccessibleStateSet(); @@ -376,7 +372,7 @@ void DocumentFocusListener::detachRecursive( const uno::Reference< accessibility::XAccessible >&, const uno::Reference< accessibility::XAccessibleContext >& xContext, const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet -) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +) { uno::Reference< accessibility::XAccessibleEventBroadcaster > xBroadcaster = uno::Reference< accessibility::XAccessibleEventBroadcaster >(xContext, uno::UNO_QUERY); diff --git a/vcl/unx/gtk/a11y/atkvalue.cxx b/vcl/unx/gtk/a11y/atkvalue.cxx index 067333af5916..6c80e37b2969 100644 --- a/vcl/unx/gtk/a11y/atkvalue.cxx +++ b/vcl/unx/gtk/a11y/atkvalue.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; /// @throws uno::RuntimeException static css::uno::Reference<css::accessibility::XAccessibleValue> - getValue( AtkValue *pValue ) throw (uno::RuntimeException) + getValue( AtkValue *pValue ) { AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pValue ); if (pWrap) diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index b31cc783c8d5..541f640484d2 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -281,7 +281,6 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext // XFilePickerNotifier void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -291,7 +290,6 @@ void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFil } void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -525,7 +523,6 @@ void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter } void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -542,7 +539,6 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUSt } void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -601,7 +597,7 @@ void SalGtkFilePicker::UpdateFilterfromUI() } } -OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() { SolarMutexGuard g; @@ -615,7 +611,6 @@ OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeExcept // XFilterGroupManager functions void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters ) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -644,7 +639,7 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle // XFilePicker functions -void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) { SolarMutexGuard g; @@ -654,7 +649,6 @@ void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( u } void SAL_CALL SalGtkFilePicker::setDefaultName( const OUString& aName ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -669,21 +663,20 @@ void SAL_CALL SalGtkFilePicker::setDefaultName( const OUString& aName ) } void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const OUString& rDirectory ) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; implsetDisplayDirectory(rDirectory); } -OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() { SolarMutexGuard g; return implgetDisplayDirectory(); } -uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles() { // no member access => no mutex needed @@ -716,7 +709,7 @@ bool lcl_matchFilter( const rtl::OUString& rFilter, const rtl::OUString& rExt ) } -uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() { SolarMutexGuard g; @@ -863,14 +856,14 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno // XExecutableDialog functions -void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) { SolarMutexGuard g; implsetTitle(rTitle); } -sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std::exception ) +sal_Int16 SAL_CALL SalGtkFilePicker::execute() { SolarMutexGuard g; @@ -1235,7 +1228,6 @@ 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, std::exception ) { SolarMutexGuard g; @@ -1261,7 +1253,6 @@ 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, std::exception ) { SolarMutexGuard g; @@ -1285,7 +1276,6 @@ 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, std::exception ) { SolarMutexGuard g; @@ -1309,7 +1299,6 @@ throw( uno::RuntimeException, std::exception ) } void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& rLabel ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1346,7 +1335,6 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& } OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1368,7 +1356,7 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) // XFilePreview functions -uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() throw( uno::RuntimeException, std::exception ) +uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() { SolarMutexGuard g; @@ -1378,7 +1366,7 @@ uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() t return uno::Sequence<sal_Int16>(); } -sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() { SolarMutexGuard g; @@ -1388,7 +1376,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeEx return 0; } -sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth() throw( uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth() { SolarMutexGuard g; @@ -1397,7 +1385,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth() throw( uno::RuntimeExce return m_PreviewImageWidth; } -sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight() throw( uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight() { SolarMutexGuard g; @@ -1407,7 +1395,6 @@ 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, std::exception ) { SolarMutexGuard g; @@ -1507,7 +1494,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, std::exception ) +sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) { SolarMutexGuard g; @@ -1541,7 +1528,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( u return true; } -sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SalGtkFilePicker::getShowState() { SolarMutexGuard g; @@ -1553,7 +1540,6 @@ sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException, // XInitialization void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments ) - throw( uno::Exception, uno::RuntimeException, std::exception ) { // parameter checking uno::Any aAny; @@ -1721,7 +1707,7 @@ void SalGtkFilePicker::preview_toggled_cb( GObject *cb, SalGtkFilePicker* pobjFP // XCancellable -void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException, std::exception ) +void SAL_CALL SalGtkFilePicker::cancel() { SolarMutexGuard g; diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index 948ff38b6094..03ee6f5e7346 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -59,107 +59,78 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base // XFilePickerNotifier - virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override; + virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override; // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) override; - virtual sal_Int16 SAL_CALL execute() - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int16 SAL_CALL execute() override; // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) override; - virtual void SAL_CALL setDefaultName( const OUString& aName ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDefaultName( const OUString& aName ) override; - virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) - throw( css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override; - virtual OUString SAL_CALL getDisplayDirectory( ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getDisplayDirectory( ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getFiles( ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getFiles( ) override; // XFilePicker2 functions - virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() override; // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) - throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) override; - virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) - throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) override; - virtual OUString SAL_CALL getCurrentFilter( ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getCurrentFilter( ) override; // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) override; // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& aValue ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& aValue ) override; - virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) override; - virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) - throw(css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) override; - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel ) override; - virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) override; // XFilePreview - virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) override; - virtual sal_Int32 SAL_CALL getTargetColorDepth( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTargetColorDepth( ) override; - virtual sal_Int32 SAL_CALL getAvailableWidth( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAvailableWidth( ) override; - virtual sal_Int32 SAL_CALL getAvailableHeight( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAvailableHeight( ) override; - virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) override; - virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) override; - virtual sal_Bool SAL_CALL getShowState( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getShowState( ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XCancellable - virtual void SAL_CALL cancel( ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL cancel( ) override; // FilePicker Event functions diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index cedbd5a20f1d..0b7549a0ee55 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -63,7 +63,6 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon } void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirectory ) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -83,7 +82,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirector aTxt.getStr() ); } -OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() { SolarMutexGuard g; @@ -97,7 +96,7 @@ OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeE return aCurrentFolderName; } -OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SalGtkFolderPicker::getDirectory() { SolarMutexGuard g; @@ -112,13 +111,12 @@ OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeExceptio } void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription*/ ) - throw( uno::RuntimeException, std::exception ) { } // XExecutableDialog functions -void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) { SolarMutexGuard g; @@ -129,7 +127,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, std::exception ) +sal_Int16 SAL_CALL SalGtkFolderPicker::execute() { SolarMutexGuard g; @@ -168,7 +166,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, s // XCancellable -void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException, std::exception ) +void SAL_CALL SalGtkFolderPicker::cancel() { SolarMutexGuard g; diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index 9e2955796c8e..e7e27b17c0cc 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -38,30 +38,23 @@ class SalGtkFolderPicker : // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) override; - virtual sal_Int16 SAL_CALL execute( ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int16 SAL_CALL execute( ) override; // XFolderPicker functions - virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) - throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) override; - virtual OUString SAL_CALL getDisplayDirectory( ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getDisplayDirectory( ) override; - virtual OUString SAL_CALL getDirectory( ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getDirectory( ) override; - virtual void SAL_CALL setDescription( const OUString& rDescription ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDescription( const OUString& rDescription ) override; // XCancellable - virtual void SAL_CALL cancel( ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL cancel( ) override; private: SalGtkFolderPicker( const SalGtkFolderPicker& ) = delete; diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index c710bb0ea9d6..060cf23abab1 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -134,7 +134,6 @@ RunDialog::~RunDialog() } void SAL_CALL RunDialog::windowOpened(const css::lang::EventObject& e) - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -154,12 +153,10 @@ void SAL_CALL RunDialog::windowOpened(const css::lang::EventObject& e) } void SAL_CALL RunDialog::queryTermination( const css::lang::EventObject& ) - throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) { } void SAL_CALL RunDialog::notifyTermination( const css::lang::EventObject& ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -201,7 +198,6 @@ SalGtkPicker::~SalGtkPicker() } void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory ) - throw( lang::IllegalArgumentException, uno::RuntimeException ) { OSL_ASSERT( m_pDialog != nullptr ); @@ -219,7 +215,7 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory aTxt.getStr() ); } -OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() { OSL_ASSERT( m_pDialog != nullptr ); @@ -231,7 +227,7 @@ OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() throw( uno::RuntimeExc return aCurrentFolderName; } -void SAL_CALL SalGtkPicker::implsetTitle( const OUString& aTitle ) throw( uno::RuntimeException ) +void SAL_CALL SalGtkPicker::implsetTitle( const OUString& aTitle ) { OSL_ASSERT( m_pDialog != nullptr ); diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index 74c46af9c995..b5bca9f75da2 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -50,17 +50,14 @@ class SalGtkPicker GtkWidget *m_pDialog; protected: /// @throws css::uno::RuntimeException - void SAL_CALL implsetTitle( const OUString& aTitle ) - throw( css::uno::RuntimeException ); + void SAL_CALL implsetTitle( const OUString& aTitle ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory ) - throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory ); /// @throws css::uno::RuntimeException - OUString SAL_CALL implgetDisplayDirectory( ) - throw( css::uno::RuntimeException ); + OUString SAL_CALL implgetDisplayDirectory( ); OUString uritounicode(const gchar *pIn); OString unicodetouri(const OUString &rURL); @@ -88,28 +85,18 @@ public: // XTopWindowListener using cppu::WeakComponentImplHelperBase::disposing; - virtual void SAL_CALL disposing( const css::lang::EventObject& ) - throw(css::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowClosing( const css::lang::EventObject& ) - throw (css::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowClosed( const css::lang::EventObject& ) - throw (css::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowMinimized( const css::lang::EventObject& ) - throw (css::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowNormalized( const css::lang::EventObject& ) - throw (css::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowActivated( const css::lang::EventObject& ) - throw (css::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& ) - throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL disposing( const css::lang::EventObject& ) override {} + virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) override; + virtual void SAL_CALL windowClosing( const css::lang::EventObject& ) override {} + virtual void SAL_CALL windowClosed( const css::lang::EventObject& ) override {} + virtual void SAL_CALL windowMinimized( const css::lang::EventObject& ) override {} + virtual void SAL_CALL windowNormalized( const css::lang::EventObject& ) override {} + virtual void SAL_CALL windowActivated( const css::lang::EventObject& ) override {} + virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& ) override {} // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) - throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) override; public: RunDialog(GtkWidget *pDialog, css::uno::Reference< css::awt::XExtendedToolkit > &rToolkit diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index d3a0310245f7..cbd746c213e6 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -3268,17 +3268,17 @@ public: } // XDropTargetDropContext - virtual void SAL_CALL acceptDrop(sal_Int8 dragOperation) throw(std::exception) override + virtual void SAL_CALL acceptDrop(sal_Int8 dragOperation) override { gdk_drag_status(m_pContext, getPreferredDragAction(dragOperation), m_nTime); } - virtual void SAL_CALL rejectDrop() throw(std::exception) override + virtual void SAL_CALL rejectDrop() override { gdk_drag_status(m_pContext, static_cast<GdkDragAction>(0), m_nTime); } - virtual void SAL_CALL dropComplete(sal_Bool bSuccess) throw(std::exception) override + virtual void SAL_CALL dropComplete(sal_Bool bSuccess) override { gtk_drag_finish(m_pContext, bSuccess, false, m_nTime); } @@ -3303,10 +3303,7 @@ public: { } - virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor) - throw(css::datatransfer::UnsupportedFlavorException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor) override { css::datatransfer::DataFlavor aFlavor(rFlavor); if (aFlavor.MimeType == "text/plain;charset=utf-16") @@ -3421,12 +3418,12 @@ public: { } - virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(std::exception) override + virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) override { gdk_drag_status(m_pContext, getPreferredDragAction(dragOperation), m_nTime); } - virtual void SAL_CALL rejectDrag() throw(std::exception) override + virtual void SAL_CALL rejectDrag() override { gdk_drag_status(m_pContext, static_cast<GdkDragAction>(0), m_nTime); } @@ -4118,7 +4115,7 @@ sal_uIntPtr GtkSalFrame::GetNativeWindowHandle() void GtkDragSource::startDrag(const datatransfer::dnd::DragGestureEvent& rEvent, sal_Int8 sourceActions, sal_Int32 /*cursor*/, sal_Int32 /*image*/, const css::uno::Reference<css::datatransfer::XTransferable>& rTrans, - const css::uno::Reference<css::datatransfer::dnd::XDragSourceListener>& rListener) throw(std::exception) + const css::uno::Reference<css::datatransfer::dnd::XDragSourceListener>& rListener) { m_xListener = rListener; m_xTrans = rTrans; diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 8ebca1c08713..9e5c9c9224dc 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -159,13 +159,11 @@ std::vector<css::datatransfer::DataFlavor> GtkTransferable::getTransferDataFlavo css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL GtkTransferable::getTransferDataFlavors() - throw(css::uno::RuntimeException, std::exception) { return comphelper::containerToSequence(getTransferDataFlavorsAsVector()); } sal_Bool SAL_CALL GtkTransferable::isDataFlavorSupported(const css::datatransfer::DataFlavor& rFlavor) - throw(css::uno::RuntimeException, std::exception) { const std::vector<css::datatransfer::DataFlavor> aAll = getTransferDataFlavorsAsVector(); @@ -188,11 +186,7 @@ public: * XTransferable */ - virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor) - throw(css::datatransfer::UnsupportedFlavorException, - css::io::IOException, - css::uno::RuntimeException, std::exception - ) override + virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor) override { GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection); if (rFlavor.MimeType == "text/plain;charset=utf-16") @@ -270,71 +264,64 @@ public: * XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /* * XClipboard */ - virtual Reference< css::datatransfer::XTransferable > SAL_CALL getContents() - throw(RuntimeException, std::exception) override; + virtual Reference< css::datatransfer::XTransferable > SAL_CALL getContents() override; virtual void SAL_CALL setContents( const Reference< css::datatransfer::XTransferable >& xTrans, - const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw(RuntimeException, std::exception) override; + const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override; - virtual OUString SAL_CALL getName() - throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; /* * XClipboardEx */ - virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw(RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL getRenderingCapabilities() override; /* * XFlushableClipboard */ - virtual void SAL_CALL flushClipboard() - throw(RuntimeException, std::exception) override; + virtual void SAL_CALL flushClipboard() override; /* * XClipboardNotifier */ virtual void SAL_CALL addClipboardListener( - const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException, std::exception) override; + const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; virtual void SAL_CALL removeClipboardListener( - const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException, std::exception) override; + const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override; void ClipboardGet(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info); void ClipboardClear(GtkClipboard *clipboard); void OwnerPossiblyChanged(GtkClipboard *clipboard, GdkEvent *event); }; -OUString VclGtkClipboard::getImplementationName() throw( RuntimeException, std::exception ) +OUString VclGtkClipboard::getImplementationName() { return OUString("com.sun.star.datatransfer.VclGtkClipboard"); } -Sequence< OUString > VclGtkClipboard::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > VclGtkClipboard::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.datatransfer.clipboard.SystemClipboard" }; return aRet; } -sal_Bool VclGtkClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) +sal_Bool VclGtkClipboard::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Reference< css::datatransfer::XTransferable > VclGtkClipboard::getContents() throw( RuntimeException, std::exception ) +Reference< css::datatransfer::XTransferable > VclGtkClipboard::getContents() { if (!m_aContents.is()) { @@ -536,7 +523,6 @@ VclGtkClipboard::VclGtkClipboard(GdkAtom nSelection) } void VclGtkClipboard::flushClipboard() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -603,7 +589,6 @@ std::vector<GtkTargetEntry> VclToGtkHelper::FormatsToGtk(const css::uno::Sequenc void VclGtkClipboard::setContents( const Reference< css::datatransfer::XTransferable >& xTrans, const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw(RuntimeException, std::exception) { osl::ClearableMutexGuard aGuard( m_aMutex ); Reference< datatransfer::clipboard::XClipboardOwner > xOldOwner( m_aOwner ); @@ -655,18 +640,17 @@ void VclGtkClipboard::setContents( } } -OUString VclGtkClipboard::getName() throw( RuntimeException, std::exception ) +OUString VclGtkClipboard::getName() { return (m_nSelection == GDK_SELECTION_CLIPBOARD) ? OUString("CLIPBOARD") : OUString("PRIMARY"); } -sal_Int8 VclGtkClipboard::getRenderingCapabilities() throw( RuntimeException, std::exception ) +sal_Int8 VclGtkClipboard::getRenderingCapabilities() { return 0; } void VclGtkClipboard::addClipboardListener( const Reference< datatransfer::clipboard::XClipboardListener >& listener ) - throw( RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -674,7 +658,6 @@ void VclGtkClipboard::addClipboardListener( const Reference< datatransfer::clipb } void VclGtkClipboard::removeClipboardListener( const Reference< datatransfer::clipboard::XClipboardListener >& listener ) - throw( RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -713,19 +696,16 @@ GtkDropTarget::GtkDropTarget() } OUString SAL_CALL GtkDropTarget::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.datatransfer.dnd.VclGtkDropTarget"); } sal_Bool SAL_CALL GtkDropTarget::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> SAL_CALL GtkDropTarget::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { Sequence<OUString> aRet { "com.sun.star.datatransfer.dnd.GtkDropTarget" }; return aRet; @@ -743,7 +723,7 @@ void GtkDropTarget::deinitialize() m_bActive = false; } -void GtkDropTarget::initialize(const Sequence<Any>& rArguments) throw( Exception, std::exception ) +void GtkDropTarget::initialize(const Sequence<Any>& rArguments) { if (rArguments.getLength() < 2) { @@ -765,14 +745,14 @@ void GtkDropTarget::initialize(const Sequence<Any>& rArguments) throw( Exception m_bActive = true; } -void GtkDropTarget::addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& xListener) throw(std::exception) +void GtkDropTarget::addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& xListener) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); m_aListeners.push_back( xListener ); } -void GtkDropTarget::removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& xListener) throw(std::exception) +void GtkDropTarget::removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& xListener) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -827,22 +807,22 @@ void GtkDropTarget::fire_dragExit(const css::datatransfer::dnd::DropTargetEvent& } } -sal_Bool GtkDropTarget::isActive() throw(std::exception) +sal_Bool GtkDropTarget::isActive() { return m_bActive; } -void GtkDropTarget::setActive(sal_Bool bActive) throw(std::exception) +void GtkDropTarget::setActive(sal_Bool bActive) { m_bActive = bActive; } -sal_Int8 GtkDropTarget::getDefaultActions() throw(std::exception) +sal_Int8 GtkDropTarget::getDefaultActions() { return m_nDefaultActions; } -void GtkDropTarget::setDefaultActions(sal_Int8 nDefaultActions) throw(std::exception) +void GtkDropTarget::setDefaultActions(sal_Int8 nDefaultActions) { m_nDefaultActions = nDefaultActions; } @@ -869,17 +849,17 @@ void GtkDragSource::deinitialize() m_pFrame = nullptr; } -sal_Bool GtkDragSource::isDragImageSupported() throw(std::exception) +sal_Bool GtkDragSource::isDragImageSupported() { return true; } -sal_Int32 GtkDragSource::getDefaultCursor( sal_Int8 ) throw(std::exception) +sal_Int32 GtkDragSource::getDefaultCursor( sal_Int8 ) { return 0; } -void GtkDragSource::initialize(const css::uno::Sequence<css::uno::Any >& rArguments) throw(Exception, std::exception) +void GtkDragSource::initialize(const css::uno::Sequence<css::uno::Any >& rArguments) { if (rArguments.getLength() < 2) { @@ -901,19 +881,16 @@ void GtkDragSource::initialize(const css::uno::Sequence<css::uno::Any >& rArgume } OUString SAL_CALL GtkDragSource::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.datatransfer.dnd.VclGtkDragSource"); } sal_Bool SAL_CALL GtkDragSource::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> SAL_CALL GtkDragSource::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { Sequence<OUString> aRet { "com.sun.star.datatransfer.dnd.GtkDragSource" }; return aRet; diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 567648a90833..4576076dcaf8 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -208,21 +208,18 @@ void KDE4FilePicker::cleanupProxy() } void SAL_CALL KDE4FilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; m_xListener = xListener; } void SAL_CALL KDE4FilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; m_xListener.clear(); } void SAL_CALL KDE4FilePicker::setTitle( const OUString &title ) - throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser aReleaser; @@ -233,7 +230,6 @@ void SAL_CALL KDE4FilePicker::setTitle( const OUString &title ) } sal_Int16 SAL_CALL KDE4FilePicker::execute() - throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser aReleaser; @@ -270,7 +266,6 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute() } void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect ) - throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -294,7 +289,6 @@ void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect ) } void SAL_CALL KDE4FilePicker::setDefaultName( const OUString &name ) - throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -306,7 +300,6 @@ void SAL_CALL KDE4FilePicker::setDefaultName( const OUString &name ) } void SAL_CALL KDE4FilePicker::setDisplayDirectory( const OUString &dir ) - throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -318,7 +311,6 @@ void SAL_CALL KDE4FilePicker::setDisplayDirectory( const OUString &dir ) } OUString SAL_CALL KDE4FilePicker::getDisplayDirectory() - throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -330,7 +322,6 @@ OUString SAL_CALL KDE4FilePicker::getDisplayDirectory() } uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles() - throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -343,7 +334,6 @@ uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles() } uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles() - throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -358,7 +348,6 @@ uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles() } void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUString &filter ) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -385,7 +374,6 @@ void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUStrin } void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title ) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -396,7 +384,6 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title ) } OUString SAL_CALL KDE4FilePicker::getCurrentFilter() - throw( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -417,7 +404,6 @@ OUString SAL_CALL KDE4FilePicker::getCurrentFilter() } void SAL_CALL KDE4FilePicker::appendFilterGroup( const OUString& rGroupTitle, const uno::Sequence<beans::StringPair>& filters) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -433,7 +419,6 @@ 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, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -450,7 +435,6 @@ 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, std::exception ) { if (CHECKBOX_AUTOEXTENSION == controlId) // We ignore this one and rely on KFileDialog to provide the function. @@ -478,7 +462,6 @@ 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, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -492,7 +475,6 @@ 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, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -509,7 +491,6 @@ void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &lab } OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId) - throw ( uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -631,7 +612,6 @@ void KDE4FilePicker::addCustomControl(sal_Int16 controlId) } void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) - throw( uno::Exception, uno::RuntimeException, std::exception ) { if( qApp->thread() != QThread::currentThread() ) { SalYieldMutexReleaser rel; @@ -762,13 +742,11 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) } void SAL_CALL KDE4FilePicker::cancel() - throw ( uno::RuntimeException, std::exception ) { } void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent ) - throw( uno::RuntimeException ) { uno::Reference<XFilePickerListener> xFilePickerListener( rEvent.Source, uno::UNO_QUERY ); @@ -779,19 +757,16 @@ void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent ) } OUString SAL_CALL KDE4FilePicker::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( FILE_PICKER_IMPL_NAME ); } sal_Bool SAL_CALL KDE4FilePicker::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { return FilePicker_getSupportedServiceNames(); } diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx index 9720e766a404..96d94a9868e2 100644 --- a/vcl/unx/kde4/KDE4FilePicker.hxx +++ b/vcl/unx/kde4/KDE4FilePicker.hxx @@ -83,34 +83,34 @@ public: virtual ~KDE4FilePicker() override; // XFilePickerNotifier - virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override; + virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override; // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int16 SAL_CALL execute() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setTitle( const OUString &rTitle ) override; + virtual sal_Int16 SAL_CALL execute() override; // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getDisplayDirectory() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getFiles() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) override; + virtual void SAL_CALL setDefaultName( const OUString &rName ) override; + virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) override; + virtual OUString SAL_CALL getDisplayDirectory() override; + virtual css::uno::Sequence< OUString > SAL_CALL getFiles() override; // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getCurrentFilter() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) override; + virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) override; + virtual OUString SAL_CALL getCurrentFilter() override; // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) override; // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) override; + virtual css::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) override; + virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) override; + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) override; + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) override; /* TODO XFilePreview @@ -124,79 +124,78 @@ public: */ // XFilePicker2 functions - virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any > &rArguments ) throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any > &rArguments ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL cancel( ) override; // XEventListener /// @throws css::uno::RuntimeException - virtual void SAL_CALL disposing( const css::lang::EventObject &rEvent ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL disposing( const css::lang::EventObject &rEvent ); using cppu::WeakComponentImplHelperBase::disposing; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private Q_SLOTS: // XExecutableDialog functions /// @throws css::uno::RuntimeException - void setTitleSlot( const OUString &rTitle ) throw( css::uno::RuntimeException ) { return setTitle( rTitle ); } + void setTitleSlot( const OUString &rTitle ) { return setTitle( rTitle ); } /// @throws css::uno::RuntimeException - sal_Int16 executeSlot() throw( css::uno::RuntimeException ) { return execute(); } + sal_Int16 executeSlot() { return execute(); } // XFilePicker functions /// @throws css::uno::RuntimeException - void setMultiSelectionModeSlot( bool bMode ) throw( css::uno::RuntimeException ) { return setMultiSelectionMode( bMode ); } + void setMultiSelectionModeSlot( bool bMode ) { return setMultiSelectionMode( bMode ); } /// @throws css::uno::RuntimeException - void setDefaultNameSlot( const OUString &rName ) throw( css::uno::RuntimeException ) { return setDefaultName( rName ); } + void setDefaultNameSlot( const OUString &rName ) { return setDefaultName( rName ); } /// @throws css::uno::RuntimeException - void setDisplayDirectorySlot( const OUString &rDirectory ) throw( css::uno::RuntimeException ) { return setDisplayDirectory( rDirectory ); } + void setDisplayDirectorySlot( const OUString &rDirectory ) { return setDisplayDirectory( rDirectory ); } /// @throws css::uno::RuntimeException - OUString getDisplayDirectorySlot() throw( css::uno::RuntimeException ) { return getDisplayDirectory(); } + OUString getDisplayDirectorySlot() { return getDisplayDirectory(); } /// @throws css::uno::RuntimeException - css::uno::Sequence< OUString > getFilesSlot() throw( css::uno::RuntimeException ) { return getFiles(); } + css::uno::Sequence< OUString > getFilesSlot() { return getFiles(); } // XFilterManager functions /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - void appendFilterSlot( const OUString &rTitle, const OUString &rFilter ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) { return appendFilter( rTitle, rFilter ); } + void appendFilterSlot( const OUString &rTitle, const OUString &rFilter ) { return appendFilter( rTitle, rFilter ); } /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - void setCurrentFilterSlot( const OUString &rTitle ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) { return setCurrentFilter( rTitle ); } + void setCurrentFilterSlot( const OUString &rTitle ) { return setCurrentFilter( rTitle ); } /// @throws css::uno::RuntimeException - OUString getCurrentFilterSlot() throw( css::uno::RuntimeException ) { return getCurrentFilter(); } + OUString getCurrentFilterSlot() { return getCurrentFilter(); } // XFilterGroupManager functions /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - void appendFilterGroupSlot( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) { return appendFilterGroup( rGroupTitle, rFilters ); } + void appendFilterGroupSlot( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) { return appendFilterGroup( rGroupTitle, rFilters ); } // XFilePickerControlAccess functions /// @throws css::uno::RuntimeException - void setValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) throw (css::uno::RuntimeException) { return setValue( nControlId, nControlAction, rValue ); } + void setValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) { return setValue( nControlId, nControlAction, rValue ); } /// @throws css::uno::RuntimeException - css::uno::Any getValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (css::uno::RuntimeException) { return getValue( nControlId, nControlAction ); } + css::uno::Any getValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction ) { return getValue( nControlId, nControlAction ); } /// @throws css::uno::RuntimeException - void enableControlSlot( sal_Int16 nControlId, bool bEnable ) throw( css::uno::RuntimeException ) { return enableControl( nControlId, bEnable ); } + void enableControlSlot( sal_Int16 nControlId, bool bEnable ) { return enableControl( nControlId, bEnable ); } /// @throws css::uno::RuntimeException - void setLabelSlot( sal_Int16 nControlId, const OUString &rLabel ) throw (css::uno::RuntimeException) { return setLabel( nControlId, rLabel ); } + void setLabelSlot( sal_Int16 nControlId, const OUString &rLabel ) { return setLabel( nControlId, rLabel ); } /// @throws css::uno::RuntimeException - OUString getLabelSlot( sal_Int16 nControlId ) throw (css::uno::RuntimeException) { return getLabel( nControlId ); } + OUString getLabelSlot( sal_Int16 nControlId ) { return getLabel( nControlId ); } // XFilePicker2 functions /// @throws css::uno::RuntimeException - css::uno::Sequence< OUString > getSelectedFilesSlot() throw (css::uno::RuntimeException) { return getSelectedFiles(); } + css::uno::Sequence< OUString > getSelectedFilesSlot() { return getSelectedFiles(); } // XInitialization /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void initializeSlot( const css::uno::Sequence< css::uno::Any > &rArguments ) throw( css::uno::Exception, css::uno::RuntimeException ) { return initialize( rArguments ); } + void initializeSlot( const css::uno::Sequence< css::uno::Any > &rArguments ) { return initialize( rArguments ); } Q_SIGNALS: // XExecutableDialog functions |