cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

22 files changed, 279 insertions, 279 deletions

diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index 521c8b404095..2e2cc9071eb8 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -137,7 +137,7 @@ void X11Clipboard::clearContents()
 
 
 Reference< XTransferable > SAL_CALL X11Clipboard::getContents()
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_rSelectionManager.getMutex());
 
@@ -151,7 +151,7 @@ Reference< XTransferable > SAL_CALL X11Clipboard::getContents()
 void SAL_CALL X11Clipboard::setContents(
     const Reference< XTransferable >& xTrans,
     const Reference< XClipboardOwner >& xClipboardOwner )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     // remember old values for callbacks before setting the new ones.
     ClearableMutexGuard aGuard(m_rSelectionManager.getMutex());
@@ -184,7 +184,7 @@ void SAL_CALL X11Clipboard::setContents(
 
 
 OUString SAL_CALL X11Clipboard::getName()
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     return m_rSelectionManager.getString( m_aSelection );
 }
@@ -192,7 +192,7 @@ OUString SAL_CALL X11Clipboard::getName()
 
 
 sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities()
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     return RenderingCapabilities::Delayed;
 }
@@ -200,7 +200,7 @@ sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities()
 
 
 void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_rSelectionManager.getMutex() );
     m_aListeners.push_back( listener );
@@ -209,7 +209,7 @@ void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardLis
 
 
 void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_rSelectionManager.getMutex() );
     m_aListeners.remove( listener );
@@ -247,19 +247,19 @@ Reference< XInterface > X11Clipboard::getReference() throw()
 
 
 OUString SAL_CALL X11Clipboard::getImplementationName(  )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     return OUString(X11_CLIPBOARD_IMPLEMENTATION_NAME);
 }
 
 sal_Bool SAL_CALL X11Clipboard::supportsService( const OUString& ServiceName )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL X11Clipboard::getSupportedServiceNames(    )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     return X11Clipboard_getSupportedServiceNames();
 }
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index 180631f3474a..4ecbc7349933 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -68,46 +68,46 @@ namespace x11 {
          */
 
         virtual OUString SAL_CALL getImplementationName(  )
-            throw(RuntimeException);
+            throw(RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw(RuntimeException);
+            throw(RuntimeException, std::exception);
 
         virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw(RuntimeException);
+            throw(RuntimeException, std::exception);
 
         /*
          * XClipboard
          */
 
         virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
-            throw(RuntimeException);
+            throw(RuntimeException, std::exception);
 
         virtual void SAL_CALL setContents(
             const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans,
             const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
-            throw(RuntimeException);
+            throw(RuntimeException, std::exception);
 
         virtual OUString SAL_CALL getName()
-            throw(RuntimeException);
+            throw(RuntimeException, std::exception);
 
         /*
          * XClipboardEx
          */
 
         virtual sal_Int8 SAL_CALL getRenderingCapabilities()
-            throw(RuntimeException);
+            throw(RuntimeException, std::exception);
 
         /*
          * XClipboardNotifier
          */
         virtual void SAL_CALL addClipboardListener(
             const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
-            throw(RuntimeException);
+            throw(RuntimeException, std::exception);
 
         virtual void SAL_CALL removeClipboardListener(
             const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
-            throw(RuntimeException);
+            throw(RuntimeException, std::exception);
 
         /*
          *  SelectionAdaptor
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx
index 05361fbec8ec..5b77bd7e2824 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.cxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx
@@ -43,17 +43,17 @@ DropTargetDropContext::~DropTargetDropContext()
 {
 }
 
-void DropTargetDropContext::acceptDrop( sal_Int8 dragOperation ) throw()
+void DropTargetDropContext::acceptDrop( sal_Int8 dragOperation ) throw(std::exception)
 {
     m_rManager.accept( dragOperation, m_aDropWindow, m_nTimestamp );
 }
 
-void DropTargetDropContext::rejectDrop() throw()
+void DropTargetDropContext::rejectDrop() throw(std::exception)
 {
     m_rManager.reject( m_aDropWindow, m_nTimestamp );
 }
 
-void DropTargetDropContext::dropComplete( sal_Bool success ) throw()
+void DropTargetDropContext::dropComplete( sal_Bool success ) throw(std::exception)
 {
     m_rManager.dropComplete( success, m_aDropWindow, m_nTimestamp );
 }
@@ -78,12 +78,12 @@ DropTargetDragContext::~DropTargetDragContext()
 {
 }
 
-void DropTargetDragContext::acceptDrag( sal_Int8 dragOperation ) throw()
+void DropTargetDragContext::acceptDrag( sal_Int8 dragOperation ) throw(std::exception)
 {
     m_rManager.accept( dragOperation, m_aDropWindow, m_nTimestamp );
 }
 
-void DropTargetDragContext::rejectDrag() throw()
+void DropTargetDragContext::rejectDrag() throw(std::exception)
 {
     m_rManager.reject( m_aDropWindow, m_nTimestamp );
 }
@@ -107,22 +107,22 @@ DragSourceContext::~DragSourceContext()
 {
 }
 
-sal_Int32 DragSourceContext::getCurrentCursor() throw()
+sal_Int32 DragSourceContext::getCurrentCursor() throw(std::exception)
 {
     return m_rManager.getCurrentCursor();
 }
 
-void DragSourceContext::setCursor( sal_Int32 cursorId ) throw()
+void DragSourceContext::setCursor( sal_Int32 cursorId ) throw(std::exception)
 {
     m_rManager.setCursor( cursorId, m_aDropWindow, m_nTimestamp );
 }
 
-void DragSourceContext::setImage( sal_Int32 imageId ) throw()
+void DragSourceContext::setImage( sal_Int32 imageId ) throw(std::exception)
 {
     m_rManager.setImage( imageId, m_aDropWindow, m_nTimestamp );
 }
 
-void DragSourceContext::transferablesFlavorsChanged() throw()
+void DragSourceContext::transferablesFlavorsChanged() throw(std::exception)
 {
     m_rManager.transferablesFlavorsChanged();
 }
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
index abdf58e8d81d..109086f29d62 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
@@ -49,9 +49,9 @@ namespace x11 {
         virtual ~DropTargetDropContext();
 
         // XDropTargetDropContext
-        virtual void SAL_CALL acceptDrop( sal_Int8 dragOperation ) throw();
-        virtual void SAL_CALL rejectDrop() throw();
-        virtual void SAL_CALL dropComplete( sal_Bool success ) throw();
+        virtual void SAL_CALL acceptDrop( sal_Int8 dragOperation ) throw(std::exception);
+        virtual void SAL_CALL rejectDrop() throw(std::exception);
+        virtual void SAL_CALL dropComplete( sal_Bool success ) throw(std::exception);
     };
 
     class DropTargetDragContext :
@@ -68,8 +68,8 @@ namespace x11 {
         virtual ~DropTargetDragContext();
 
         // XDropTargetDragContext
-        virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw();
-        virtual void SAL_CALL rejectDrag() throw();
+        virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw(std::exception);
+        virtual void SAL_CALL rejectDrag() throw(std::exception);
     };
 
     class DragSourceContext :
@@ -86,10 +86,10 @@ namespace x11 {
         virtual ~DragSourceContext();
 
         // XDragSourceContext
-        virtual sal_Int32   SAL_CALL getCurrentCursor() throw();
-        virtual void        SAL_CALL setCursor( sal_Int32 cursorId ) throw();
-        virtual void        SAL_CALL setImage( sal_Int32 imageId ) throw();
-        virtual void        SAL_CALL transferablesFlavorsChanged() throw();
+        virtual sal_Int32   SAL_CALL getCurrentCursor() throw(std::exception);
+        virtual void        SAL_CALL setCursor( sal_Int32 cursorId ) throw(std::exception);
+        virtual void        SAL_CALL setImage( sal_Int32 imageId ) throw(std::exception);
+        virtual void        SAL_CALL transferablesFlavorsChanged() throw(std::exception);
     };
 } // namespace
 
diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx
index 9c593a487d34..d90e8a58ad84 100644
--- a/vcl/unx/generic/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx
@@ -48,7 +48,7 @@ DropTarget::~DropTarget()
 
 
 
-void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception )
+void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception )
 {
     if( arguments.getLength() > 1 )
     {
@@ -78,7 +78,7 @@ void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::su
 
 
 
-void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw()
+void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
 
@@ -87,7 +87,7 @@ void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >&
 
 
 
-void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw()
+void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
 
@@ -96,14 +96,14 @@ void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener
 
 
 
-sal_Bool DropTarget::isActive() throw()
+sal_Bool DropTarget::isActive() throw(std::exception)
 {
     return m_bActive;
 }
 
 
 
-void DropTarget::setActive( sal_Bool active ) throw()
+void DropTarget::setActive( sal_Bool active ) throw(std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
 
@@ -112,14 +112,14 @@ void DropTarget::setActive( sal_Bool active ) throw()
 
 
 
-sal_Int8 DropTarget::getDefaultActions() throw()
+sal_Int8 DropTarget::getDefaultActions() throw(std::exception)
 {
     return m_nDefaultActions;
 }
 
 
 
-void DropTarget::setDefaultActions( sal_Int8 actions ) throw()
+void DropTarget::setDefaultActions( sal_Int8 actions ) throw(std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
 
@@ -183,17 +183,17 @@ void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw()
 }
 
 // XServiceInfo
-OUString DropTarget::getImplementationName() throw()
+OUString DropTarget::getImplementationName() throw(std::exception)
 {
     return OUString(XDND_DROPTARGET_IMPLEMENTATION_NAME);
 }
 
-sal_Bool DropTarget::supportsService( const OUString& ServiceName ) throw()
+sal_Bool DropTarget::supportsService( const OUString& ServiceName ) throw(std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > DropTarget::getSupportedServiceNames() throw()
+Sequence< OUString > DropTarget::getSupportedServiceNames() throw(std::exception)
 {
     return Xdnd_dropTarget_getSupportedServiceNames();
 }
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index ff8e07a80ba0..0ac8dd748297 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -316,7 +316,7 @@ XLIB_Cursor SelectionManager::createCursor( const unsigned char* pPointerData, c
     return aCursor;
 }
 
-void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::com::sun::star::uno::Exception)
+void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::com::sun::star::uno::Exception, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
 
@@ -2932,14 +2932,14 @@ void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time )
  *  XDragSource
  */
 
-sal_Bool SelectionManager::isDragImageSupported() throw()
+sal_Bool SelectionManager::isDragImageSupported() throw(std::exception)
 {
     return sal_False;
 }
 
 
 
-sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw()
+sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception)
 {
     XLIB_Cursor aCursor = m_aNoneCursor;
     if( dragAction & DNDConstants::ACTION_MOVE )
@@ -3190,7 +3190,7 @@ void SelectionManager::startDrag(
                                  sal_Int32,
                                  const css::uno::Reference< XTransferable >& transferable,
                                  const css::uno::Reference< XDragSourceListener >& listener
-                                 ) throw()
+                                 ) throw(std::exception)
 {
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "startDrag( sourceActions = %x )\n", (int)sourceActions );
@@ -3857,7 +3857,7 @@ void SelectionManager::shutdown() throw()
 
 
 
-sal_Bool SelectionManager::handleEvent( const Any& event ) throw()
+sal_Bool SelectionManager::handleEvent( const Any& event ) throw(std::exception)
 {
     Sequence< sal_Int8 > aSeq;
     if( (event >>= aSeq) )
@@ -3893,14 +3893,14 @@ sal_Bool SelectionManager::handleEvent( const Any& event ) throw()
 }
 
 void SAL_CALL SelectionManager::disposing( const ::com::sun::star::lang::EventObject& rEvt )
-    throw( ::com::sun::star::uno::RuntimeException )
+    throw( ::com::sun::star::uno::RuntimeException, std::exception )
 {
     if (rEvt.Source == m_xDesktop || rEvt.Source == m_xDisplayConnection)
         shutdown();
 }
 
 void SAL_CALL SelectionManager::queryTermination( const ::com::sun::star::lang::EventObject& )
-    throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException )
+    throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception )
 {
 }
 
@@ -3910,7 +3910,7 @@ void SAL_CALL SelectionManager::queryTermination( const ::com::sun::star::lang::
  * has been called before vcl is shutdown
  */
 void SAL_CALL SelectionManager::notifyTermination( const ::com::sun::star::lang::EventObject& rEvent )
-    throw( ::com::sun::star::uno::RuntimeException )
+    throw( ::com::sun::star::uno::RuntimeException, std::exception )
 {
     disposing(rEvent);
 }
@@ -4097,7 +4097,7 @@ SelectionManagerHolder::~SelectionManagerHolder()
 
 
 
-void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception )
+void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception )
 {
     OUString aDisplayName;
 
@@ -4121,14 +4121,14 @@ void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) thro
  *  XDragSource
  */
 
-sal_Bool SelectionManagerHolder::isDragImageSupported() throw()
+sal_Bool SelectionManagerHolder::isDragImageSupported() throw(std::exception)
 {
     return m_xRealDragSource.is() ? m_xRealDragSource->isDragImageSupported() : sal_False;
 }
 
 
 
-sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw()
+sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception)
 {
     return m_xRealDragSource.is() ? m_xRealDragSource->getDefaultCursor( dragAction ) : 0;
 }
@@ -4140,7 +4140,7 @@ void SelectionManagerHolder::startDrag(
                                        sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image,
                                        const css::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable,
                                        const css::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener >& listener
-                                       ) throw()
+                                       ) throw(std::exception)
 {
     if( m_xRealDragSource.is() )
         m_xRealDragSource->startDrag( trigger, sourceActions, cursor, image, transferable, listener );
@@ -4154,17 +4154,17 @@ void SelectionManagerHolder::startDrag(
 
 
 
-OUString SelectionManagerHolder::getImplementationName() throw()
+OUString SelectionManagerHolder::getImplementationName() throw(std::exception)
 {
     return OUString(XDND_IMPLEMENTATION_NAME);
 }
 
-sal_Bool SelectionManagerHolder::supportsService( const OUString& ServiceName ) throw()
+sal_Bool SelectionManagerHolder::supportsService( const OUString& ServiceName ) throw(std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SelectionManagerHolder::getSupportedServiceNames() throw()
+Sequence< OUString > SelectionManagerHolder::getSupportedServiceNames() throw(std::exception)
 {
     return Xdnd_getSupportedServiceNames();
 }
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index db8c8741b9e1..fe7306596203 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -94,21 +94,21 @@ namespace x11 {
         void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw();
 
         // XInitialization
-        virtual void        SAL_CALL initialize( const Sequence< Any >& args ) throw ( ::com::sun::star::uno::Exception );
+        virtual void        SAL_CALL initialize( const Sequence< Any >& args ) throw ( ::com::sun::star::uno::Exception, std::exception );
 
         // XDropTarget
-        virtual void        SAL_CALL addDropTargetListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw();
-        virtual void        SAL_CALL removeDropTargetListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw();
-        virtual sal_Bool    SAL_CALL isActive() throw();
-        virtual void        SAL_CALL setActive( sal_Bool active ) throw();
-        virtual sal_Int8    SAL_CALL getDefaultActions() throw();
-        virtual void        SAL_CALL setDefaultActions( sal_Int8 actions ) throw();
+        virtual void        SAL_CALL addDropTargetListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception);
+        virtual void        SAL_CALL removeDropTargetListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception);
+        virtual sal_Bool    SAL_CALL isActive() throw(std::exception);
+        virtual void        SAL_CALL setActive( sal_Bool active ) throw(std::exception);
+        virtual sal_Int8    SAL_CALL getDefaultActions() throw(std::exception);
+        virtual void        SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception);
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw();
-        virtual sal_Bool    SAL_CALL supportsService( const OUString& ServiceName ) throw();
+        virtual OUString SAL_CALL getImplementationName() throw(std::exception);
+        virtual sal_Bool    SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception);
         virtual ::com::sun::star::uno::Sequence< OUString >
-                            SAL_CALL getSupportedServiceNames() throw();
+                            SAL_CALL getSupportedServiceNames() throw(std::exception);
     };
 
     class SelectionManagerHolder :
@@ -126,23 +126,23 @@ namespace x11 {
         virtual ~SelectionManagerHolder();
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw();
-        virtual sal_Bool    SAL_CALL supportsService( const OUString& ServiceName ) throw();
+        virtual OUString SAL_CALL getImplementationName() throw(std::exception);
+        virtual sal_Bool    SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception);
         virtual ::com::sun::star::uno::Sequence< OUString >
-                            SAL_CALL getSupportedServiceNames() throw();
+                            SAL_CALL getSupportedServiceNames() throw(std::exception);
 
         // XInitialization
-        virtual void        SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception );
+        virtual void        SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception );
 
         // XDragSource
-        virtual sal_Bool    SAL_CALL isDragImageSupported() throw();
-        virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw();
+        virtual sal_Bool    SAL_CALL isDragImageSupported() throw(std::exception);
+        virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception);
         virtual void        SAL_CALL startDrag(
             const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger,
             sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image,
             const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable,
             const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener >& listener
-            ) throw();
+            ) throw(std::exception);
 
     };
 
@@ -476,20 +476,20 @@ namespace x11 {
         void shutdown() throw();
 
         // XInitialization
-        virtual void        SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception );
+        virtual void        SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception );
 
         // XEventHandler
-        virtual sal_Bool    SAL_CALL handleEvent( const Any& event ) throw();
+        virtual sal_Bool    SAL_CALL handleEvent( const Any& event ) throw(std::exception);
 
         // XDragSource
-        virtual sal_Bool    SAL_CALL isDragImageSupported() throw();
-        virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw();
+        virtual sal_Bool    SAL_CALL isDragImageSupported() throw(std::exception);
+        virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception);
         virtual void        SAL_CALL startDrag(
             const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger,
             sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image,
             const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable,
             const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener >& listener
-            ) throw();
+            ) throw(std::exception);
 
         // SelectionAdaptor for XdndSelection Drag (we are drag source)
         virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > getTransferable() throw();
@@ -498,13 +498,13 @@ namespace x11 {
         virtual com::sun::star::uno::Reference< XInterface > getReference() throw();
 
         // XEventListener
-        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
         // XTerminateListener
         virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent )
-                throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException );
+                throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception );
         virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent )
-                throw( ::com::sun::star::uno::RuntimeException );
+                throw( ::com::sun::star::uno::RuntimeException, std::exception );
     };
 
 
diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx
index 4ecac7165a36..5321f084ae13 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
@@ -55,7 +55,7 @@ X11Transferable::~X11Transferable()
 
 
 Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor )
-    throw(UnsupportedFlavorException, IOException, RuntimeException)
+    throw(UnsupportedFlavorException, IOException, RuntimeException, std::exception)
 {
     Any aRet;
     Sequence< sal_Int8 > aData;
@@ -88,7 +88,7 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor )
 
 
 Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors()
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     Sequence< DataFlavor > aFlavorList;
     bool bSuccess = m_rManager.getPasteDataTypes( m_aSelection ? m_aSelection : XA_PRIMARY, aFlavorList );
@@ -101,7 +101,7 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors()
 
 
 sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFlavor )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     if( aFlavor.DataType != getCppuType( (Sequence< sal_Int8 >*)0 ) )
     {
diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx
index 1a4145462b06..d1263a64d6b2 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.hxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.hxx
@@ -46,14 +46,14 @@ namespace x11 {
         virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
             throw(::com::sun::star::datatransfer::UnsupportedFlavorException,
                   ::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException
+                  ::com::sun::star::uno::RuntimeException, std::exception
                   );
 
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  )
-            throw(::com::sun::star::uno::RuntimeException);
+            throw(::com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
-            throw(::com::sun::star::uno::RuntimeException);
+            throw(::com::sun::star::uno::RuntimeException, std::exception);
     };
 
 } // namespace
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index f13a0a318601..ebdac0053ed6 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -89,7 +89,7 @@ extern "C" {
 }
 
 // XEventListener implementation
-void AtkListener::disposing( const lang::EventObject& ) throw (uno::RuntimeException)
+void AtkListener::disposing( const lang::EventObject& ) throw (uno::RuntimeException, std::exception)
 {
     if( mpWrapper )
     {
@@ -268,7 +268,7 @@ getAccessibleContextFromSource( const uno::Reference< uno::XInterface >& rxSourc
 /*****************************************************************************/
 
 // XAccessibleEventListener
-void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException )
+void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException, std::exception )
 {
     if( !mpWrapper )
         return;
diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx
index c878a1fe469a..8b3cb7fff5d3 100644
--- a/vcl/unx/gtk/a11y/atklistener.hxx
+++ b/vcl/unx/gtk/a11y/atklistener.hxx
@@ -36,11 +36,11 @@ public:
 
     // XEventListener
     virtual void disposing( const ::com::sun::star::lang::EventObject& Source )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     // XAccessibleEventListener
     virtual void notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
     AtkObjectWrapper *mpWrapper;
     AccessibleVector m_aChildList;
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index d487a67e6125..e8fe27a65d7c 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -181,16 +181,16 @@ public:
         throw (lang::IndexOutOfBoundsException, uno::RuntimeException);
 
     // XEventListener
-    virtual void disposing( const lang::EventObject& Source ) throw (uno::RuntimeException);
+    virtual void disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception);
 
     // XAccessibleEventListener
-    virtual void notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException );
+    virtual void notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException, std::exception );
 };
 
 /*****************************************************************************/
 
 void DocumentFocusListener::disposing( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException)
+    throw (uno::RuntimeException, std::exception)
 {
 
     // Unref the object here, but do not remove as listener since the object
@@ -203,7 +203,7 @@ void DocumentFocusListener::disposing( const lang::EventObject& aEvent )
 /*****************************************************************************/
 
 void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     switch( aEvent.EventId )
     {
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index da9f630b57bb..ce7d1ed42cc9 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -317,7 +317,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
 
 
 void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -327,7 +327,7 @@ void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFil
 }
 
 void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -600,7 +600,7 @@ void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter
 
 
 void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -621,7 +621,7 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUSt
 
 
 void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -687,7 +687,7 @@ void SalGtkFilePicker::UpdateFilterfromUI()
     }
 }
 
-OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException )
+OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -708,7 +708,7 @@ OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeExcept
 
 
 void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -739,7 +739,7 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle
 // XFilePicker functions
 
 
-void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException )
+void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -749,7 +749,7 @@ void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( u
 }
 
 void SAL_CALL SalGtkFilePicker::setDefaultName( const OUString& aName )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -764,21 +764,21 @@ void SAL_CALL SalGtkFilePicker::setDefaultName( const OUString& aName )
 }
 
 void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const OUString& rDirectory )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
     implsetDisplayDirectory(rDirectory);
 }
 
-OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::RuntimeException )
+OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
     return implgetDisplayDirectory();
 }
 
-uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException )
+uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException, std::exception )
 {
     // no member access => no mutex needed
 
@@ -811,7 +811,7 @@ bool lcl_matchFilter( const rtl::OUString& rFilter, const rtl::OUString& rExt )
 
 }
 
-uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException )
+uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -960,14 +960,14 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno
 // XExecutableDialog functions
 
 
-void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException )
+void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
     implsetTitle(rTitle);
 }
 
-sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException )
+sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1331,7 +1331,7 @@ uno::Any SalGtkFilePicker::HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nC
 }
 
 void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1359,7 +1359,7 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr
 }
 
 uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nControlAction )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1384,7 +1384,7 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nC
 }
 
 void SAL_CALL SalGtkFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnable )
-throw( uno::RuntimeException )
+throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1412,7 +1412,7 @@ throw( uno::RuntimeException )
 }
 
 void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& rLabel )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1449,7 +1449,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString&
 }
 
 OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1473,7 +1473,7 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
 // XFilePreview functions
 
 
-uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() throw( uno::RuntimeException )
+uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1483,7 +1483,7 @@ uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() t
     return uno::Sequence<sal_Int16>();
 }
 
-sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeException )
+sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1493,7 +1493,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeEx
     return 0;
 }
 
-sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth() throw( uno::RuntimeException )
+sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1502,7 +1502,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth() throw( uno::RuntimeExce
     return m_PreviewImageWidth;
 }
 
-sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight() throw( uno::RuntimeException )
+sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1512,7 +1512,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight() throw( uno::RuntimeExc
 }
 
 void SAL_CALL SalGtkFilePicker::setImage( sal_Int16 /*aImageFormat*/, const uno::Any& /*aImage*/ )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1612,7 +1612,7 @@ void SalGtkFilePicker::update_preview_cb( GtkFileChooser *file_chooser, SalGtkFi
         g_free( filename );
 }
 
-sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( uno::RuntimeException )
+sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1646,7 +1646,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( u
     return true;
 }
 
-sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException )
+sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1660,7 +1660,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException
 
 
 void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments )
-    throw( uno::Exception, uno::RuntimeException )
+    throw( uno::Exception, uno::RuntimeException, std::exception )
 {
     // parameter checking
     uno::Any aAny;
@@ -1824,7 +1824,7 @@ void SalGtkFilePicker::preview_toggled_cb( GObject *cb, SalGtkFilePicker* pobjFP
 // XCancellable
 
 
-void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException )
+void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index c40355f8791f..4daa294e98b0 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -70,124 +70,124 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
 
 
         virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
         virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
 
         // XExecutableDialog functions
 
 
         virtual void SAL_CALL setTitle( const OUString& aTitle )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
         virtual sal_Int16 SAL_CALL execute()
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
 
         // XFilePicker functions
 
 
         virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
         virtual void SAL_CALL setDefaultName( const OUString& aName )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
         virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
             throw( com::sun::star::lang::IllegalArgumentException,
-                ::com::sun::star::uno::RuntimeException );
+                ::com::sun::star::uno::RuntimeException, std::exception );
 
         virtual OUString SAL_CALL getDisplayDirectory(  )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
         virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles(  )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
 
         // XFilePicker2 functions
 
 
         virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles()
-                throw (::com::sun::star::uno::RuntimeException);
+                throw (::com::sun::star::uno::RuntimeException, std::exception);
 
 
         // XFilterManager functions
 
 
         virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
-            throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception );
 
         virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
-            throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception );
 
         virtual OUString SAL_CALL getCurrentFilter(  )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
 
         // XFilterGroupManager functions
 
 
         virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
-                throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+                throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
 
 
         // XFilePickerControlAccess functions
 
 
         virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue )
-                throw (::com::sun::star::uno::RuntimeException);
+                throw (::com::sun::star::uno::RuntimeException, std::exception);
 
         virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
-                throw (::com::sun::star::uno::RuntimeException);
+                throw (::com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable )
-            throw(::com::sun::star::uno::RuntimeException );
+            throw(::com::sun::star::uno::RuntimeException, std::exception );
 
         virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
         virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
 
         // XFilePreview
 
 
         virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Int32 SAL_CALL getTargetColorDepth(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Int32 SAL_CALL getAvailableWidth(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Int32 SAL_CALL getAvailableHeight(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& aImage )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL getShowState(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
 
         // XInitialization
 
 
         virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-            throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+            throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
 
 
         // XCancellable
 
 
         virtual void SAL_CALL cancel( )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
 
         // XEventListener
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 8b0f7fbf983f..46fdcdbe4475 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -75,7 +75,7 @@ void SAL_CALL SalGtkFolderPicker::disposing( const lang::EventObject& )
 }
 
 void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirectory )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -95,7 +95,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirector
         aTxt.getStr() );
 }
 
-OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeException )
+OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -109,7 +109,7 @@ OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeE
     return aCurrentFolderName;
 }
 
-OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException )
+OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -124,7 +124,7 @@ OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeExceptio
 }
 
 void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription*/ )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
 }
 
@@ -132,7 +132,7 @@ void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription
 // XExecutableDialog functions
 
 
-void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException )
+void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -143,7 +143,7 @@ void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno:
     gtk_window_set_title( GTK_WINDOW( m_pDialog ), aWindowTitle.getStr() );
 }
 
-sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException )
+sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -181,7 +181,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException )
 // XCancellable
 
 
-void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException )
+void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
index c0921dfd7a3c..e4ca5bf62892 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
@@ -42,33 +42,33 @@ class SalGtkFolderPicker :
 
 
         virtual void SAL_CALL setTitle( const OUString& aTitle )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
         virtual sal_Int16 SAL_CALL execute(  )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
 
         // XFolderPicker functions
 
 
         virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory )
-            throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception );
 
         virtual OUString SAL_CALL getDisplayDirectory(  )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
         virtual OUString SAL_CALL getDirectory( )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
         virtual void SAL_CALL setDescription( const OUString& rDescription )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
 
         // XCancellable
 
 
         virtual void SAL_CALL cancel( )
-            throw( ::com::sun::star::uno::RuntimeException );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
 
         // XEventListener
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index aa280df9ffde..25553aa6ad3b 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -130,7 +130,7 @@ RunDialog::~RunDialog()
 }
 
 void SAL_CALL RunDialog::windowOpened( const ::com::sun::star::lang::EventObject& )
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -138,12 +138,12 @@ void SAL_CALL RunDialog::windowOpened( const ::com::sun::star::lang::EventObject
 }
 
 void SAL_CALL RunDialog::queryTermination( const ::com::sun::star::lang::EventObject& )
-        throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException)
+        throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL RunDialog::notifyTermination( const ::com::sun::star::lang::EventObject& )
-        throw(::com::sun::star::uno::RuntimeException)
+        throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
index 57889bbec785..a3ae4690189e 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
@@ -93,27 +93,27 @@ public:
     // XTopWindowListener
     using cppu::WeakComponentImplHelperBase::disposing;
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& )
-        throw(::com::sun::star::uno::RuntimeException) {}
+        throw(::com::sun::star::uno::RuntimeException, std::exception) {}
     virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
     virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& )
-        throw (::com::sun::star::uno::RuntimeException) {}
+        throw (::com::sun::star::uno::RuntimeException, std::exception) {}
     virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& )
-        throw (::com::sun::star::uno::RuntimeException) {}
+        throw (::com::sun::star::uno::RuntimeException, std::exception) {}
     virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& )
-        throw (::com::sun::star::uno::RuntimeException) {}
+        throw (::com::sun::star::uno::RuntimeException, std::exception) {}
     virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& )
-        throw (::com::sun::star::uno::RuntimeException) {}
+        throw (::com::sun::star::uno::RuntimeException, std::exception) {}
     virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& )
-        throw (::com::sun::star::uno::RuntimeException) {}
+        throw (::com::sun::star::uno::RuntimeException, std::exception) {}
     virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& )
-        throw (::com::sun::star::uno::RuntimeException) {}
+        throw (::com::sun::star::uno::RuntimeException, std::exception) {}
 
     // XTerminateListener
     virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent )
-        throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException);
+        throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception);
     virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent )
-        throw(::com::sun::star::uno::RuntimeException);
+        throw(::com::sun::star::uno::RuntimeException, std::exception);
 public:
     RunDialog(GtkWidget *pDialog,
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit,
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index ca378f6534fc..43dec15789fa 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -129,7 +129,7 @@ UnxFilePicker::~UnxFilePicker()
 }
 
 void SAL_CALL UnxFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     OSL_ASSERT( m_pNotifyThread );
     osl::MutexGuard aGuard( m_aMutex );
@@ -138,7 +138,7 @@ void SAL_CALL UnxFilePicker::addFilePickerListener( const uno::Reference<XFilePi
 }
 
 void SAL_CALL UnxFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     OSL_ASSERT( m_pNotifyThread );
     osl::MutexGuard aGuard( m_aMutex );
@@ -147,7 +147,7 @@ void SAL_CALL UnxFilePicker::removeFilePickerListener( const uno::Reference<XFil
 }
 
 void SAL_CALL UnxFilePicker::setTitle( const OUString &rTitle )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -161,7 +161,7 @@ void SAL_CALL UnxFilePicker::setTitle( const OUString &rTitle )
 }
 
 sal_Int16 SAL_CALL UnxFilePicker::execute()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     checkFilePicker();
 
@@ -178,7 +178,7 @@ sal_Int16 SAL_CALL UnxFilePicker::execute()
 }
 
 void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -191,7 +191,7 @@ void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode )
 }
 
 void SAL_CALL UnxFilePicker::setDefaultName( const OUString &rName )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -205,7 +205,7 @@ void SAL_CALL UnxFilePicker::setDefaultName( const OUString &rName )
 }
 
 void SAL_CALL UnxFilePicker::setDisplayDirectory( const OUString &rDirectory )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -219,7 +219,7 @@ void SAL_CALL UnxFilePicker::setDisplayDirectory( const OUString &rDirectory )
 }
 
 OUString SAL_CALL UnxFilePicker::getDisplayDirectory()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -231,7 +231,7 @@ OUString SAL_CALL UnxFilePicker::getDisplayDirectory()
 }
 
 uno::Sequence< OUString > SAL_CALL UnxFilePicker::getFiles()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -243,7 +243,7 @@ uno::Sequence< OUString > SAL_CALL UnxFilePicker::getFiles()
 }
 
 void SAL_CALL UnxFilePicker::appendFilter( const OUString &rTitle, const OUString &rFilter )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -259,7 +259,7 @@ void SAL_CALL UnxFilePicker::appendFilter( const OUString &rTitle, const OUStrin
 }
 
 void SAL_CALL UnxFilePicker::setCurrentFilter( const OUString &rTitle )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -273,7 +273,7 @@ void SAL_CALL UnxFilePicker::setCurrentFilter( const OUString &rTitle )
 }
 
 OUString SAL_CALL UnxFilePicker::getCurrentFilter()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -285,7 +285,7 @@ OUString SAL_CALL UnxFilePicker::getCurrentFilter()
 }
 
 void SAL_CALL UnxFilePicker::appendFilterGroup( const OUString &rGroupTitle, const uno::Sequence<beans::StringPair> &rFilters )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -309,7 +309,7 @@ void SAL_CALL UnxFilePicker::appendFilterGroup( const OUString &rGroupTitle, con
 }
 
 void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any &rValue )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -390,7 +390,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA
 }
 
 uno::Any SAL_CALL UnxFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nControlAction )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -416,7 +416,7 @@ uno::Any SAL_CALL UnxFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nCont
 }
 
 void SAL_CALL UnxFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnable )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -431,7 +431,7 @@ void SAL_CALL UnxFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnab
 }
 
 void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const OUString &rLabel )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -447,7 +447,7 @@ void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const OUString &rLa
 }
 
 OUString SAL_CALL UnxFilePicker::getLabel(sal_Int16 /*nControlId*/)
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     // FIXME getLabel() is not yet implemented
     checkFilePicker();
@@ -523,7 +523,7 @@ sal_Bool SAL_CALL UnxFilePicker::getShowState()
 */
 
 void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArguments )
-    throw( uno::Exception, uno::RuntimeException )
+    throw( uno::Exception, uno::RuntimeException, std::exception )
 {
     initFilePicker();
 
@@ -629,7 +629,7 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
 }
 
 void SAL_CALL UnxFilePicker::cancel()
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     // FIXME cancel() is not implemented
     checkFilePicker();
@@ -648,19 +648,19 @@ void SAL_CALL UnxFilePicker::disposing( const lang::EventObject &rEvent )
 }
 
 OUString SAL_CALL UnxFilePicker::getImplementationName()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return OUString( FILE_PICKER_IMPL_NAME );
 }
 
 sal_Bool SAL_CALL UnxFilePicker::supportsService( const OUString& ServiceName )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL UnxFilePicker::getSupportedServiceNames()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return FilePicker_getSupportedServiceNames();
 }
@@ -917,7 +917,7 @@ void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId )
 }
 
 uno::Sequence< OUString > SAL_CALL UnxFilePicker::getSelectedFiles()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return getFiles();
 }
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index 58aec56647e4..4f639763018f 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -78,39 +78,39 @@ public:
 
     // XFilePickerNotifier
 
-    virtual void SAL_CALL       addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL       removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL       addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL       removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XExecutableDialog functions
 
-    virtual void SAL_CALL       setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Int16 SAL_CALL  execute() throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL       setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual sal_Int16 SAL_CALL  execute() throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XFilePicker functions
 
-    virtual void SAL_CALL       setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL       setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL       setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL       setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL       setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL       setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XFilterManager functions
 
-    virtual void SAL_CALL       appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL       setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL       appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL       setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XFilterGroupManager functions
 
-    virtual void SAL_CALL       appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL       appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
 
     // XFilePickerControlAccess functions
 
-    virtual void SAL_CALL       setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL       enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL       setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException);
-    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL       setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+    virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+    virtual void SAL_CALL       enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL       setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     /* TODO XFilePreview
 
@@ -126,15 +126,15 @@ public:
     // XFilePicker2
 
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles()
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     // XInitialization
 
-    virtual void SAL_CALL       initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL       initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XCancellable
 
-    virtual void SAL_CALL       cancel( ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL       cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XEventListener
 
@@ -142,9 +142,9 @@ public:
 
     // XServiceInfo
 
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL   supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL   supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
 private:
     // prevent copy and assignment
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index e8ddaebd5464..a66420191b2d 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -213,21 +213,21 @@ void KDE4FilePicker::cleanupProxy()
 }
 
 void SAL_CALL KDE4FilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     m_xListener = xListener;
 }
 
 void SAL_CALL KDE4FilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     m_xListener.clear();
 }
 
 void SAL_CALL KDE4FilePicker::setTitle( const OUString &title )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser aReleaser;
@@ -238,7 +238,7 @@ void SAL_CALL KDE4FilePicker::setTitle( const OUString &title )
 }
 
 sal_Int16 SAL_CALL KDE4FilePicker::execute()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser aReleaser;
@@ -277,7 +277,7 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
 }
 
 void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -301,7 +301,7 @@ void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect )
 }
 
 void SAL_CALL KDE4FilePicker::setDefaultName( const OUString &name )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -313,7 +313,7 @@ void SAL_CALL KDE4FilePicker::setDefaultName( const OUString &name )
 }
 
 void SAL_CALL KDE4FilePicker::setDisplayDirectory( const OUString &dir )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -325,7 +325,7 @@ void SAL_CALL KDE4FilePicker::setDisplayDirectory( const OUString &dir )
 }
 
 OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -337,7 +337,7 @@ OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
 }
 
 uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -353,7 +353,7 @@ uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles()
 }
 
 uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -364,7 +364,7 @@ uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles()
 }
 
 void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUString &filter )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -391,7 +391,7 @@ void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUStrin
 }
 
 void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -404,7 +404,7 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title )
 }
 
 OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -425,7 +425,7 @@ OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
 }
 
 void SAL_CALL KDE4FilePicker::appendFilterGroup( const OUString& rGroupTitle, const uno::Sequence<beans::StringPair>& filters)
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
+    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -441,7 +441,7 @@ void SAL_CALL KDE4FilePicker::appendFilterGroup( const OUString& rGroupTitle, co
 }
 
 void SAL_CALL KDE4FilePicker::setValue( sal_Int16 controlId, sal_Int16 nControlAction, const uno::Any &value )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -458,7 +458,7 @@ void SAL_CALL KDE4FilePicker::setValue( sal_Int16 controlId, sal_Int16 nControlA
 }
 
 uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 nControlAction )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if (CHECKBOX_AUTOEXTENSION == controlId)
         // We ignore this one and rely on KFileDialog to provide the function.
@@ -486,7 +486,7 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 nCont
 }
 
 void SAL_CALL KDE4FilePicker::enableControl( sal_Int16 controlId, sal_Bool enable )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -500,7 +500,7 @@ void SAL_CALL KDE4FilePicker::enableControl( sal_Int16 controlId, sal_Bool enabl
 }
 
 void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &label )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -517,7 +517,7 @@ void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &lab
 }
 
 OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId)
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -630,7 +630,7 @@ void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
 }
 
 void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
-    throw( uno::Exception, uno::RuntimeException )
+    throw( uno::Exception, uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser release;
@@ -736,7 +736,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
 }
 
 void SAL_CALL KDE4FilePicker::cancel()
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
 
 }
@@ -753,19 +753,19 @@ void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent )
 }
 
 OUString SAL_CALL KDE4FilePicker::getImplementationName()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return OUString( FILE_PICKER_IMPL_NAME );
 }
 
 sal_Bool SAL_CALL KDE4FilePicker::supportsService( const OUString& ServiceName )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSupportedServiceNames()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return FilePicker_getSupportedServiceNames();
 }
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 7c29af7a1fee..3cde3cf140e7 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -87,34 +87,34 @@ public:
     virtual ~KDE4FilePicker();
 
     // XFilePickerNotifier
-    virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XExecutableDialog functions
-    virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XFilePicker functions
-    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XFilterManager functions
-    virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XFilterGroupManager functions
-    virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
 
     // XFilePickerControlAccess functions
-    virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException);
-    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+    virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+    virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     /* TODO XFilePreview
 
@@ -129,22 +129,22 @@ public:
 
     // XFilePicker2 functions
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles()
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     // XInitialization
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XCancellable
-    virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
     // XEventListener
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject &rEvent ) throw( ::com::sun::star::uno::RuntimeException );
     using cppu::WeakComponentImplHelperBase::disposing;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
 private Q_SLOTS:
     // XExecutableDialog functions