Remove dynamic exception specifications

...(for now, from LIBO_INTERNAL_CODE only).  See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.

Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly).  The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually).  There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).

Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code.  Missing @throws
documentation has not been applied in such manual clean-up.

Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

36 files changed, 373 insertions, 639 deletions

diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index dc49f3534a9a..90c4604b01d2 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -83,23 +83,19 @@ public:
     //XFilterManager delegates
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter );
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL setCurrentFilter( const OUString& aTitle )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    void SAL_CALL setCurrentFilter( const OUString& aTitle );
 
     /// @throws css::uno::RuntimeException
-    OUString SAL_CALL getCurrentFilter(  )
-        throw( css::uno::RuntimeException );
+    OUString SAL_CALL getCurrentFilter(  );
 
     //XFilterGroupManager delegates
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters );
 
 
     //accessor
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index 2e06025bc6ce..2eb54b0d94b9 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -261,7 +261,6 @@ void FilterHelper::SetFilters()
 }
 
 void FilterHelper::appendFilter(const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilterString)
-throw( css::lang::IllegalArgumentException, css::uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -279,13 +278,11 @@ throw( css::lang::IllegalArgumentException, css::uno::RuntimeException )
 }
 
 void FilterHelper::setCurrentFilter( const ::rtl::OUString& aTitle )
-throw( css::lang::IllegalArgumentException, css::uno::RuntimeException )
 {
     SetCurFilter(aTitle);
 }
 
 ::rtl::OUString SAL_CALL FilterHelper::getCurrentFilter(  )
-throw( css::uno::RuntimeException )
 {
     ::rtl::OUString sReturn = (m_aCurrentFilter);
 
@@ -293,7 +290,6 @@ throw( css::uno::RuntimeException )
 }
 
 void SAL_CALL FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
 
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 658fa7df259e..a4ffa6893e42 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -52,100 +52,74 @@ public:
 
     // XFilePickerNotifier
 
-    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-        throw( css::uno::RuntimeException ) override;
-    virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-        throw( css::uno::RuntimeException ) 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 ) override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
-    virtual sal_Int16 SAL_CALL execute(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
     // XFilePicker functions
 
-    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) override;
 
-    virtual void SAL_CALL setDefaultName( const OUString& aName )
-        throw( css::uno::RuntimeException ) 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 ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDisplayDirectory(  ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  ) override;
 
-    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 ) 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 ) override;
+    virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) override;
 
-    virtual OUString SAL_CALL getCurrentFilter(  )
-        throw( css::uno::RuntimeException ) 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) 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) 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) 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 ) 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) 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) override;
+    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) override;
 
     // XInitialization
 
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw(css::uno::Exception, css::uno::RuntimeException) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XCancellable
 
-    virtual void SAL_CALL cancel( )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL cancel( ) override;
 
     // XEventListener
 
     using cppu::WeakComponentImplHelperBase::disposing;
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent )
-        throw(css::uno::RuntimeException);
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent );
 
     // XServiceInfo
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // FilePicker Event functions
 
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index d24682024aff..1e8de0e13113 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -94,14 +94,12 @@ SalAquaFilePicker::~SalAquaFilePicker()
 #pragma mark XFilePickerNotifier
 
 void SAL_CALL SalAquaFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
-    throw( uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
     m_xListener = xListener;
 }
 
 void SAL_CALL SalAquaFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& )
-    throw( uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
     m_xListener.clear();
@@ -109,13 +107,13 @@ void SAL_CALL SalAquaFilePicker::removeFilePickerListener( const uno::Reference<
 
 #pragma mark XAsynchronousExecutableDialog
 
-void SAL_CALL SalAquaFilePicker::setTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException )
+void SAL_CALL SalAquaFilePicker::setTitle( const rtl::OUString& aTitle )
 {
     SolarMutexGuard aGuard;
     implsetTitle(aTitle);
 }
 
-sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
+sal_Int16 SAL_CALL SalAquaFilePicker::execute()
 {
     SolarMutexGuard aGuard;
 
@@ -200,7 +198,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
 
 #pragma mark XFilePicker
 
-void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool /* bMode */ ) throw( uno::RuntimeException )
+void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool /* bMode */ )
 {
     SolarMutexGuard aGuard;
 
@@ -210,7 +208,6 @@ void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool /* bMode */ ) t
 }
 
 void SAL_CALL SalAquaFilePicker::setDefaultName( const rtl::OUString& aName )
-throw( uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -218,21 +215,20 @@ throw( uno::RuntimeException )
 }
 
 void SAL_CALL SalAquaFilePicker::setDisplayDirectory( const rtl::OUString& rDirectory )
-throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
     implsetDisplayDirectory(rDirectory);
 }
 
-rtl::OUString SAL_CALL SalAquaFilePicker::getDisplayDirectory() throw( uno::RuntimeException )
+rtl::OUString SAL_CALL SalAquaFilePicker::getDisplayDirectory()
 {
     rtl::OUString retVal = implgetDisplayDirectory();
 
     return retVal;
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno::RuntimeException )
+uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles()
 {
     uno::Sequence< rtl::OUString > aSelectedFiles = getSelectedFiles();
     // multiselection doesn't really work with getFiles
@@ -243,7 +239,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno::
     return aSelectedFiles;
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() throw( uno::RuntimeException, std::exception )
+uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles()
 {
     SolarMutexGuard aGuard;
 
@@ -310,7 +306,6 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() thro
 #pragma mark XFilterManager
 
 void SAL_CALL SalAquaFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter )
-throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -320,7 +315,6 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
 }
 
 void SAL_CALL SalAquaFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
-throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -331,7 +325,7 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
     updateSaveFileNameExtension();
 }
 
-rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter() throw( uno::RuntimeException )
+rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter()
 {
     SolarMutexGuard aGuard;
 
@@ -343,7 +337,6 @@ rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter() throw( uno::Runtime
 #pragma mark XFilterGroupManager
 
 void SAL_CALL SalAquaFilePicker::appendFilterGroup( const rtl::OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters )
-throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -355,7 +348,6 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
 #pragma mark XFilePickerControlAccess
 
 void SAL_CALL SalAquaFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue )
-throw( uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -367,7 +359,6 @@ throw( uno::RuntimeException )
 }
 
 uno::Any SAL_CALL SalAquaFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nControlAction )
-throw( uno::RuntimeException )
 {
     uno::Any aValue = m_pControlHelper->getValue(nControlId, nControlAction);
 
@@ -375,13 +366,11 @@ throw( uno::RuntimeException )
 }
 
 void SAL_CALL SalAquaFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnable )
-throw( uno::RuntimeException )
 {
     m_pControlHelper->enableControl(nControlId, bEnable);
 }
 
 void SAL_CALL SalAquaFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString& aLabel )
-throw( uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -390,7 +379,6 @@ throw( uno::RuntimeException )
 }
 
 rtl::OUString SAL_CALL SalAquaFilePicker::getLabel( sal_Int16 nControlId )
-throw( uno::RuntimeException )
 {
     return m_pControlHelper->getLabel(nControlId);
 }
@@ -398,7 +386,6 @@ throw( uno::RuntimeException )
 #pragma mark XInitialization
 
 void SAL_CALL SalAquaFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments )
-throw( uno::Exception, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -472,7 +459,7 @@ throw( uno::Exception, uno::RuntimeException )
 
 #pragma mark XCancellable
 
-void SAL_CALL SalAquaFilePicker::cancel() throw( uno::RuntimeException )
+void SAL_CALL SalAquaFilePicker::cancel()
 {
     SolarMutexGuard aGuard;
 
@@ -483,7 +470,7 @@ void SAL_CALL SalAquaFilePicker::cancel() throw( uno::RuntimeException )
 
 #pragma mark XEventListener
 
-void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException )
+void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -496,7 +483,6 @@ void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) th
 #pragma mark XServiceInfo
 
 rtl::OUString SAL_CALL SalAquaFilePicker::getImplementationName()
-throw( uno::RuntimeException )
 {
     rtl::OUString retVal( FILE_PICKER_IMPL_NAME );
 
@@ -504,13 +490,11 @@ throw( uno::RuntimeException )
 }
 
 sal_Bool SAL_CALL SalAquaFilePicker::supportsService( const rtl::OUString& sServiceName )
-throw( uno::RuntimeException )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSupportedServiceNames()
-throw( uno::RuntimeException )
 {
     return FilePicker_getSupportedServiceNames();
 }
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index 547cae2f5f38..d827240fd4dd 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -51,54 +51,43 @@ public:
     // XExecutableDialog functions
 
 
-    virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
-    virtual sal_Int16 SAL_CALL execute(  )
-        throw( css::uno::RuntimeException ) 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 ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDisplayDirectory(  ) override;
 
-    virtual OUString SAL_CALL getDirectory( )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDirectory( ) override;
 
-    virtual void SAL_CALL setDescription( const OUString& rDescription )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDescription( const OUString& rDescription ) override;
 
 
     // XServiceInfo
 
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 
     // XCancellable
 
 
-    virtual void SAL_CALL cancel( )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL cancel( ) override;
 
 
     // XEventListener
 
 
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent )
-        throw(css::uno::RuntimeException) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
 private:
     SalAquaFolderPicker( const SalAquaFolderPicker& ) = delete;
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 24c1817c2084..ff1d519aba60 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -67,14 +67,14 @@ SalAquaFolderPicker::SalAquaFolderPicker( const uno::Reference<lang::XMultiServi
 
 // XExecutableDialog
 
-void SAL_CALL SalAquaFolderPicker::setTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException )
+void SAL_CALL SalAquaFolderPicker::setTitle( const rtl::OUString& aTitle )
 {
     SolarMutexGuard aGuard;
 
     implsetTitle(aTitle);
 }
 
-sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
+sal_Int16 SAL_CALL SalAquaFolderPicker::execute()
 {
     SolarMutexGuard aGuard;
 
@@ -111,14 +111,13 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
 // XFolderPicker
 
 void SAL_CALL SalAquaFolderPicker::setDisplayDirectory( const rtl::OUString& aDirectory )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
     implsetDisplayDirectory(aDirectory);
 }
 
-rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory() throw( uno::RuntimeException )
+rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory()
 {
     SolarMutexGuard aGuard;
 
@@ -127,7 +126,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory() throw( uno::Ru
     return aDirectory;
 }
 
-rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeException )
+rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory()
 {
     SolarMutexGuard aGuard;
 
@@ -155,7 +154,6 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeEx
 }
 
 void SAL_CALL SalAquaFolderPicker::setDescription( const rtl::OUString& rDescription )
-    throw( uno::RuntimeException )
 {
     [m_pDialog setMessage:[NSString stringWithOUString:rDescription]];
 }
@@ -163,7 +161,6 @@ void SAL_CALL SalAquaFolderPicker::setDescription( const rtl::OUString& rDescrip
 // XServiceInfo
 
 rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName()
-    throw( uno::RuntimeException )
 {
     rtl::OUString retVal( FOLDER_PICKER_IMPL_NAME );
 
@@ -171,20 +168,18 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName()
 }
 
 sal_Bool SAL_CALL SalAquaFolderPicker::supportsService( const rtl::OUString& sServiceName )
-    throw( uno::RuntimeException )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 uno::Sequence<rtl::OUString> SAL_CALL SalAquaFolderPicker::getSupportedServiceNames()
-    throw( uno::RuntimeException )
 {
     return FolderPicker_getSupportedServiceNames();
 }
 
 // XCancellable
 
-void SAL_CALL SalAquaFolderPicker::cancel() throw( uno::RuntimeException )
+void SAL_CALL SalAquaFolderPicker::cancel()
 {
     SolarMutexGuard aGuard;
 
@@ -194,7 +189,6 @@ void SAL_CALL SalAquaFolderPicker::cancel() throw( uno::RuntimeException )
 // XEventListener
 
 void SAL_CALL SalAquaFolderPicker::disposing( const lang::EventObject& )
-    throw( uno::RuntimeException )
 {
 }
 
diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index c91cb32b70c4..fa0c8b959e63 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -73,17 +73,14 @@ protected:
     NavigationServices_DialogType m_nDialogType;
 
     /// @throws css::uno::RuntimeException
-    void implsetTitle( const OUString& aTitle )
-        throw( css::uno::RuntimeException );
+    void implsetTitle( const OUString& aTitle );
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void implsetDisplayDirectory( const OUString& rDirectory )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    void implsetDisplayDirectory( const OUString& rDirectory );
 
     /// @throws css::uno::RuntimeException
-    OUString const & implgetDisplayDirectory(  )
-        throw( css::uno::RuntimeException );
+    OUString const & implgetDisplayDirectory(  );
 
     void implInitialize( );
 
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index 4452f6506968..bb91affec99d 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -186,7 +186,6 @@ int SalAquaPicker::runandwaitforresult()
 }
 
 void SAL_CALL SalAquaPicker::implsetDisplayDirectory( const rtl::OUString& aDirectory )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -195,12 +194,12 @@ void SAL_CALL SalAquaPicker::implsetDisplayDirectory( const rtl::OUString& aDire
     }
 }
 
-rtl::OUString const & SAL_CALL SalAquaPicker::implgetDisplayDirectory() throw( uno::RuntimeException )
+rtl::OUString const & SAL_CALL SalAquaPicker::implgetDisplayDirectory()
 {
     return m_sDisplayDirectory;
 }
 
-void SAL_CALL SalAquaPicker::implsetTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException )
+void SAL_CALL SalAquaPicker::implsetTitle( const rtl::OUString& aTitle )
 {
     SolarMutexGuard aGuard;
 
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 0177748a01fa..1022932c1042 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -492,13 +492,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( SvtRemoteFilePicker, SvtFilePicker, OCommonPic
 // XExecutableDialog functions
 
 
-void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception)
+void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle )
 {
     OCommonPicker::setTitle( _rTitle );
 }
 
 
-sal_Int16 SAL_CALL SvtFilePicker::execute(  ) throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL SvtFilePicker::execute(  )
 {
     return OCommonPicker::execute();
 }
@@ -507,15 +507,13 @@ sal_Int16 SAL_CALL SvtFilePicker::execute(  ) throw (RuntimeException, std::exce
 // XAsynchronousExecutableDialog functions
 
 
-void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception)
+void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle )
 {
     setTitle( _rTitle );
 }
 
 
 void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< css::ui::dialogs::XDialogClosedListener >& xListener )
-    throw (RuntimeException,
-           std::exception)
 {
     m_xDlgClosedListener = xListener;
     prepareDialog();
@@ -528,7 +526,7 @@ void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< css::ui::dialog
 // XFilePicker functions
 
 
-void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( RuntimeException, std::exception )
+void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode )
 {
     checkAlive();
 
@@ -536,7 +534,7 @@ void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( Runt
     m_bMultiSelection = bMode;
 }
 
-void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName ) throw( RuntimeException, std::exception )
+void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName )
 {
     checkAlive();
 
@@ -545,7 +543,6 @@ void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName ) throw( Runt
 }
 
 void SAL_CALL SvtFilePicker::setDisplayDirectory( const OUString& aDirectory )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -553,7 +550,7 @@ void SAL_CALL SvtFilePicker::setDisplayDirectory( const OUString& aDirectory )
     m_aDisplayDirectory = aDirectory;
 }
 
-OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtFilePicker::getDisplayDirectory()
 {
     checkAlive();
 
@@ -579,7 +576,7 @@ OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeException,
         return m_aDisplayDirectory;
 }
 
-Sequence< OUString > SAL_CALL SvtFilePicker::getSelectedFiles() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvtFilePicker::getSelectedFiles()
 {
     checkAlive();
 
@@ -603,7 +600,7 @@ Sequence< OUString > SAL_CALL SvtFilePicker::getSelectedFiles() throw( RuntimeEx
     return aFiles;
 }
 
-Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvtFilePicker::getFiles()
 {
     Sequence< OUString > aFiles = getSelectedFiles();
     if (aFiles.getLength() > 1)
@@ -618,7 +615,6 @@ Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException,
 void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID,
                                        sal_Int16 nControlAction,
                                        const Any& rValue )
-    throw( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -661,7 +657,6 @@ void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID,
 
 
 Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAction )
-    throw( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -696,7 +691,6 @@ Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAc
 
 
 void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValue )
-    throw ( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -736,7 +730,6 @@ void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValu
 
 
 OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID )
-    throw ( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -769,7 +762,6 @@ OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID )
 
 
 void SAL_CALL SvtFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnable )
-    throw( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -811,7 +803,7 @@ void SAL_CALL SvtFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnab
 // XFilePickerNotifier functions
 
 
-void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePickerListener >& xListener ) throw ( RuntimeException, std::exception )
+void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePickerListener >& xListener )
 {
     checkAlive();
 
@@ -820,7 +812,7 @@ void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePicker
 }
 
 
-void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePickerListener >& ) throw ( RuntimeException, std::exception )
+void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePickerListener >& )
 {
     checkAlive();
 
@@ -833,7 +825,6 @@ void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePic
 
 
 Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats()
-    throw ( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -846,7 +837,7 @@ Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats()
 }
 
 
-sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth()
 {
     checkAlive();
 
@@ -860,7 +851,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException
 }
 
 
-sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth()
 {
     checkAlive();
 
@@ -874,7 +865,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException,
 }
 
 
-sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight()
 {
     checkAlive();
 
@@ -889,7 +880,6 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException,
 
 
 void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage )
-    throw ( IllegalArgumentException, RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -900,7 +890,6 @@ void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage
 
 
 sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool )
-    throw ( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -928,7 +917,7 @@ sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool )
 }
 
 
-sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvtFilePicker::getShowState()
 {
     checkAlive();
 
@@ -947,7 +936,6 @@ sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException, std::e
 
 void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle,
                                                 const Sequence< StringPair >& aFilters )
-    throw ( IllegalArgumentException, RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -975,7 +963,6 @@ void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle,
 
 void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle,
                                            const OUString& aFilter )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -994,7 +981,6 @@ void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle,
 
 
 void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -1010,7 +996,6 @@ void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle )
 
 
 OUString SAL_CALL SvtFilePicker::getCurrentFilter()
-    throw( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -1025,7 +1010,6 @@ OUString SAL_CALL SvtFilePicker::getCurrentFilter()
 
 
 void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
-    throw ( Exception, RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -1108,19 +1092,19 @@ bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, co
 
 
 /* XServiceInfo */
-OUString SAL_CALL SvtFilePicker::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtFilePicker::getImplementationName()
 {
     return impl_getStaticImplementationName();
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL SvtFilePicker::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvtFilePicker::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL SvtFilePicker::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvtFilePicker::getSupportedServiceNames()
 {
     return impl_getStaticSupportedServiceNames();
 }
@@ -1140,7 +1124,7 @@ OUString SvtFilePicker::impl_getStaticImplementationName()
 
 /* Helper for registry */
 Reference< XInterface > SAL_CALL SvtFilePicker::impl_createInstance(
-    const Reference< XComponentContext >& ) throw( Exception )
+    const Reference< XComponentContext >& )
 {
     return Reference< XInterface >( *new SvtFilePicker );
 }
@@ -1172,19 +1156,19 @@ VclPtr<SvtFileDialog_Base> SvtRemoteFilePicker::implCreateDialog( vcl::Window* _
 
 
 /* XServiceInfo */
-OUString SAL_CALL SvtRemoteFilePicker::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtRemoteFilePicker::getImplementationName()
 {
     return impl_getStaticImplementationName();
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL SvtRemoteFilePicker::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvtRemoteFilePicker::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL SvtRemoteFilePicker::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvtRemoteFilePicker::getSupportedServiceNames()
 {
     return impl_getStaticSupportedServiceNames();
 }
@@ -1204,7 +1188,7 @@ OUString SvtRemoteFilePicker::impl_getStaticImplementationName()
 
 /* Helper for registry */
 Reference< XInterface > SAL_CALL SvtRemoteFilePicker::impl_createInstance(
-    const Reference< XComponentContext >& ) throw( Exception )
+    const Reference< XComponentContext >& )
 {
     return Reference< XInterface >( *new SvtRemoteFilePicker );
 }
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 0886b3ca1665..be50fc211e8f 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -98,97 +98,95 @@ public:
 
     // 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;
 
 
     // XAsynchronousExecutableDialog functions
 
-    virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) override;
+    virtual void SAL_CALL startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) 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& aName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) throw( css::lang::IllegalArgumentException, 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 css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setMultiSelectionMode( sal_Bool bMode ) override;
+    virtual void SAL_CALL           setDefaultName( const OUString& aName ) override;
+    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) override;
+    virtual OUString SAL_CALL    getDisplayDirectory() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() override;
 
 
     // XFilePickerControlAccess functions
 
 
-    virtual void SAL_CALL           setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const css::uno::Any& value ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL           getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setLabel( sal_Int16 ElementID, const OUString& aValue ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL    getLabel( sal_Int16 ElementID ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           enableControl( sal_Int16 ElementID, sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const css::uno::Any& value ) override;
+    virtual css::uno::Any SAL_CALL           getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) override;
+    virtual void SAL_CALL           setLabel( sal_Int16 ElementID, const OUString& aValue ) override;
+    virtual OUString SAL_CALL    getLabel( sal_Int16 ElementID ) override;
+    virtual void SAL_CALL           enableControl( sal_Int16 ElementID, sal_Bool bEnable ) override;
 
 
     // XFilePickerNotifier functions
 
 
-    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;
 
 
     // XFilePreview functions
 
 
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL      getTargetColorDepth() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL      getAvailableWidth() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL      getAvailableHeight() throw ( css::uno::RuntimeException, std::exception ) 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 sal_Bool SAL_CALL       setShowState( sal_Bool bShowState ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL       getShowState() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() override;
+    virtual sal_Int32 SAL_CALL      getTargetColorDepth() override;
+    virtual sal_Int32 SAL_CALL      getAvailableWidth() override;
+    virtual sal_Int32 SAL_CALL      getAvailableHeight() override;
+    virtual void SAL_CALL           setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) override;
+    virtual sal_Bool SAL_CALL       setShowState( sal_Bool bShowState ) override;
+    virtual sal_Bool SAL_CALL       getShowState() 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           setCurrentFilter( const OUString& aTitle ) 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& aTitle, const OUString& aFilter ) override;
+    virtual void SAL_CALL           setCurrentFilter( const OUString& aTitle ) 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;
 
 
     // these methods are here because they're ambiguous
 
-    virtual void SAL_CALL           cancel() throw( css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL           cancel() override
      { ::svt::OCommonPicker::cancel(); }
-    virtual void SAL_CALL           dispose() throw( css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL           dispose() override
      { ::svt::OCommonPicker::dispose(); }
-    virtual void SAL_CALL           addEventListener(const css::uno::Reference<css::lang::XEventListener>& l) throw( css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL           addEventListener(const css::uno::Reference<css::lang::XEventListener>& l) override
      { ::svt::OCommonPicker::addEventListener(l); }
-    virtual void SAL_CALL           removeEventListener(const css::uno::Reference<css::lang::XEventListener>& l) throw( css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL           removeEventListener(const css::uno::Reference<css::lang::XEventListener>& l) override
      { ::svt::OCommonPicker::removeEventListener(l); }
 
 
     // XInitialization functions
 
 
-    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;
 
 
     // XServiceInfo functions
 
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL       getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL       getImplementationName() override;
+    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-                                    getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+                                    getSupportedServiceNames() override;
 
     /* Helper for XServiceInfo */
     static css::uno::Sequence< OUString >
@@ -198,8 +196,7 @@ public:
     /* Helper for registry */
     /// @throws css::uno::Exception
     static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance (
-        const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-        throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
 protected:
 
@@ -244,10 +241,10 @@ public:
     DECLARE_XTYPEPROVIDER( )
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-                                    getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+                                    getSupportedServiceNames() override;
 
     /* Helper for XServiceInfo */
     static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
@@ -256,8 +253,7 @@ public:
     /* Helper for registry */
     /// @throws css::uno::Exception
     static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance (
-        const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-        throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 };
 
 #endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index ec1f8a8e0f35..dd0b34c36b4c 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -43,22 +43,22 @@ SvtFolderPicker::~SvtFolderPicker()
 {
 }
 
-void SAL_CALL SvtFolderPicker::setTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception)
+void SAL_CALL SvtFolderPicker::setTitle( const OUString& _rTitle )
 {
     OCommonPicker::setTitle( _rTitle );
 }
 
-sal_Int16 SAL_CALL SvtFolderPicker::execute(  ) throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL SvtFolderPicker::execute(  )
 {
     return OCommonPicker::execute();
 }
 
-void SAL_CALL SvtFolderPicker::setDialogTitle( const OUString& _rTitle) throw (RuntimeException, std::exception)
+void SAL_CALL SvtFolderPicker::setDialogTitle( const OUString& _rTitle)
 {
     setTitle( _rTitle );
 }
 
-void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< css::ui::dialogs::XDialogClosedListener >& xListener )
 {
     m_xListener = xListener;
     prepareDialog();
@@ -108,12 +108,11 @@ IMPL_LINK( SvtFolderPicker, DialogClosedHdl, Dialog&, rDlg, void )
 }
 
 void SAL_CALL SvtFolderPicker::setDisplayDirectory( const OUString& aDirectory )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     m_aDisplayDirectory = aDirectory;
 }
 
-OUString SAL_CALL SvtFolderPicker::getDisplayDirectory() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtFolderPicker::getDisplayDirectory()
 {
     if ( ! getDialog() )
         return m_aDisplayDirectory;
@@ -126,7 +125,7 @@ OUString SAL_CALL SvtFolderPicker::getDisplayDirectory() throw( RuntimeException
     return OUString();
 }
 
-OUString SAL_CALL SvtFolderPicker::getDirectory() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtFolderPicker::getDirectory()
 {
     if ( ! getDialog() )
         return m_aDisplayDirectory;
@@ -140,30 +139,29 @@ OUString SAL_CALL SvtFolderPicker::getDirectory() throw( RuntimeException, std::
 }
 
 void SAL_CALL SvtFolderPicker::setDescription( const OUString& aDescription )
-    throw( RuntimeException, std::exception )
 {
     m_aDescription = aDescription;
 }
 
-void SvtFolderPicker::cancel() throw (RuntimeException, std::exception)
+void SvtFolderPicker::cancel()
 {
     OCommonPicker::cancel();
 }
 
 /* XServiceInfo */
-OUString SAL_CALL SvtFolderPicker::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtFolderPicker::getImplementationName()
 {
     return impl_getStaticImplementationName();
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL SvtFolderPicker::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvtFolderPicker::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames()
 {
     return impl_getStaticSupportedServiceNames();
 }
@@ -183,7 +181,6 @@ OUString SvtFolderPicker::impl_getStaticImplementationName()
 
 /* Helper for registry */
 Reference< XInterface > SAL_CALL SvtFolderPicker::impl_createInstance( const Reference< XComponentContext >&  )
-    throw( Exception )
 {
     return Reference< XInterface >( *new SvtFolderPicker );
 }
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 771bdf8b2790..3883bd6c46ba 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -56,35 +56,34 @@ public:
     // XFolderPicker2 functions
 
 
-    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL       getDisplayDirectory() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL       getDirectory() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setDescription( const OUString& aDescription ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) override;
+    virtual OUString SAL_CALL       getDisplayDirectory() override;
+    virtual OUString SAL_CALL       getDirectory() override;
+    virtual void SAL_CALL           setDescription( const OUString& aDescription ) override;
 
-    virtual void SAL_CALL cancel()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cancel() 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;
 
 
     // XAsynchronousExecutableDialog functions
 
-    virtual void SAL_CALL       setDialogTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL       startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL       setDialogTitle( const OUString& _rTitle ) override;
+    virtual void SAL_CALL       startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) override;
 
 
     // XServiceInfo functions
 
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL    getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL    getImplementationName() override;
+    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-                                    getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+                                    getSupportedServiceNames() override;
 
     /* Helper for XServiceInfo */
     static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
@@ -93,8 +92,7 @@ public:
     /* Helper for registry */
     /// @throws css::uno::Exception
     static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance (
-        const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-        throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
 protected:
 
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index f498a79c0d0a..1150ed51864e 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -137,7 +137,7 @@ namespace svt
 
     // XEventListener
 
-    void SAL_CALL OCommonPicker::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL OCommonPicker::disposing( const EventObject& _rSource )
     {
         SolarMutexGuard aGuard;
         bool bDialogDying = _rSource.Source == m_xWindow;
@@ -178,13 +178,13 @@ namespace svt
     }
 
 
-    Reference< XPropertySetInfo > SAL_CALL OCommonPicker::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo > SAL_CALL OCommonPicker::getPropertySetInfo(  )
     {
         return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
     }
 
 
-    void SAL_CALL OCommonPicker::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception)
+    void SAL_CALL OCommonPicker::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
     {
         OPropertyContainer::setFastPropertyValue_NoBroadcast( _nHandle, _rValue );
 
@@ -244,7 +244,7 @@ namespace svt
 
     // XControlAccess functions
 
-    void SAL_CALL OCommonPicker::setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const Any& aValue ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL OCommonPicker::setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const Any& aValue )
     {
         checkAlive();
 
@@ -257,7 +257,7 @@ namespace svt
     }
 
 
-    Any SAL_CALL OCommonPicker::getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    Any SAL_CALL OCommonPicker::getControlProperty( const OUString& aControlName, const OUString& aControlProperty )
     {
         checkAlive();
 
@@ -274,7 +274,7 @@ namespace svt
 
     // XControlInformation functions
 
-    Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControls(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControls(  )
     {
         checkAlive();
 
@@ -289,7 +289,7 @@ namespace svt
     }
 
 
-    sal_Bool SAL_CALL OCommonPicker::isControlSupported( const OUString& aControlName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OCommonPicker::isControlSupported( const OUString& aControlName )
     {
         checkAlive();
 
@@ -303,7 +303,7 @@ namespace svt
     }
 
 
-    Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControlProperties( const OUString& aControlName ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControlProperties( const OUString& aControlName )
     {
         checkAlive();
 
@@ -318,7 +318,7 @@ namespace svt
     }
 
 
-    sal_Bool SAL_CALL OCommonPicker::isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL OCommonPicker::isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty )
     {
         checkAlive();
 
@@ -335,14 +335,14 @@ namespace svt
 
     // XExecutableDialog functions
 
-    void SAL_CALL OCommonPicker::setTitle( const OUString& _rTitle ) throw( RuntimeException, std::exception )
+    void SAL_CALL OCommonPicker::setTitle( const OUString& _rTitle )
     {
         SolarMutexGuard aGuard;
         m_aTitle = _rTitle;
     }
 
 
-    sal_Int16 OCommonPicker::execute() throw (RuntimeException, std::exception)
+    sal_Int16 OCommonPicker::execute()
     {
         SolarMutexGuard aGuard;
 
@@ -364,7 +364,7 @@ namespace svt
 
     // XCancellable functions
 
-    void SAL_CALL OCommonPicker::cancel(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL OCommonPicker::cancel(  )
     {
         {
             ::osl::MutexGuard aGuard( m_aMutex );
@@ -409,7 +409,6 @@ namespace svt
     // XInitialization functions
 
     void SAL_CALL OCommonPicker::initialize( const Sequence< Any >& _rArguments )
-        throw ( Exception, RuntimeException, std::exception )
     {
         checkAlive();
 
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 36bc38be5463..5212080433ef 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -114,14 +114,14 @@ namespace svt
 
         // XEventListner
 
-        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;
 
 
         // property set related methods
 
 
         // XPropertySet pure methods
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
         // OPropertySetHelper pure methods
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
         // OPropertyArrayUsageHelper pure methods
@@ -129,40 +129,40 @@ namespace svt
 
         // OPropertySetHelper overridden methods
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
-                sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw (css::uno::Exception, std::exception) override;
+                sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
 
 
         // XExecutableDialog functions
 
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL           setTitle( const OUString& _rTitle ) throw( css::uno::RuntimeException, std::exception );
+        virtual void SAL_CALL           setTitle( const OUString& _rTitle );
         /// @throws css::uno::RuntimeException
-        virtual sal_Int16 SAL_CALL      execute() throw( css::uno::RuntimeException, std::exception );
+        virtual sal_Int16 SAL_CALL      execute();
 
 
         // XControlAccess functions
 
-        virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const css::uno::Any& aValue ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) override;
 
 
         // XControlInformation functions
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControls(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControls(  ) override;
+        virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) override;
+        virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) override;
 
 
         // XCancellable functions
 
-        virtual void SAL_CALL cancel(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL cancel(  ) override;
 
 
         // XInitialization functions
 
 
-        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;
 
 
         // misc
diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx
index 0ed85f4f9904..8da72d68d805 100644
--- a/fpicker/source/office/fpinteraction.cxx
+++ b/fpicker/source/office/fpinteraction.cxx
@@ -47,7 +47,7 @@ namespace svt
     }
 
 
-    void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest ) throw (RuntimeException, std::exception)
+    void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest )
     {
         if (!_rxRequest.is())
             return;
diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx
index 26d82bc61151..f4ad88fb8122 100644
--- a/fpicker/source/office/fpinteraction.hxx
+++ b/fpicker/source/office/fpinteraction.hxx
@@ -69,7 +69,7 @@ namespace svt
 
     protected:
         // XInteractionHandler
-        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) override;
 
     private:
         virtual ~OFilePickerInteractionHandler() override;
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index bc8ab0821708..bcea58ada593 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -74,7 +74,6 @@ CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xSer
 // XFPEventListenerManager
 
 void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePickerListener>& xListener)
-    throw(uno::RuntimeException)
 {
     if ( rBHelper.bDisposed )
         throw lang::DisposedException(
@@ -86,7 +85,6 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke
 }
 
 void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePickerListener>& xListener )
-    throw(uno::RuntimeException)
 {
     if ( rBHelper.bDisposed )
         throw lang::DisposedException(
@@ -98,7 +96,7 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi
 
 // XEventListener
 
-void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent) throw(uno::RuntimeException)
+void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent)
 {
     uno::Reference<XFilePickerListener> xFilePickerListener(aEvent.Source, css::uno::UNO_QUERY);
 
@@ -199,14 +197,14 @@ void CFilePicker::resumeEventNotification()
 
 // XFilePicker
 
-void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode) throw(uno::RuntimeException)
+void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
     m_pImpl->setMultiSelectionMode(bMode);
 }
 
-void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeException)
+void SAL_CALL CFilePicker::setTitle(const OUString& aTitle)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
@@ -214,7 +212,6 @@ void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeEx
 }
 
 void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString& aFilter)
-    throw(lang::IllegalArgumentException, uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
@@ -222,14 +219,13 @@ void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString&
 }
 
 void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle)
-    throw(lang::IllegalArgumentException, uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
     m_pImpl->setCurrentFilter(aTitle);
 }
 
-OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException)
+OUString SAL_CALL CFilePicker::getCurrentFilter()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
@@ -237,7 +233,6 @@ OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException)
 }
 
 void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
-    throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
@@ -245,7 +240,6 @@ void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const
 }
 
 void SAL_CALL CFilePicker::setDefaultName(const OUString& aName)
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
@@ -253,28 +247,27 @@ void SAL_CALL CFilePicker::setDefaultName(const OUString& aName)
 }
 
 void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory)
-    throw(lang::IllegalArgumentException, uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
     m_pImpl->setDisplayDirectory(aDirectory);
 }
 
-OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException)
+OUString SAL_CALL CFilePicker::getDisplayDirectory()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->getDisplayDirectory();
 }
 
-uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeException)
+uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->getFiles();
 }
 
-uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
@@ -311,7 +304,7 @@ uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::R
     return comphelper::containerToSequence(lTarget);
 }
 
-sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
+sal_Int16 SAL_CALL CFilePicker::execute()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -340,7 +333,6 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
 }
 
 void SAL_CALL CFilePicker::setValue(sal_Int16 aControlId, sal_Int16 aControlAction, const uno::Any& aValue)
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -349,7 +341,6 @@ void SAL_CALL CFilePicker::setValue(sal_Int16 aControlId, sal_Int16 aControlActi
 }
 
 uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControlAction)
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -358,7 +349,6 @@ uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControl
 }
 
 void SAL_CALL CFilePicker::enableControl(sal_Int16 aControlId, sal_Bool bEnable)
-throw(uno::RuntimeException)
 {
     OSL_ASSERT( nullptr != m_pImpl.get( ) );
 
@@ -367,7 +357,6 @@ throw(uno::RuntimeException)
 }
 
 void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel)
-    throw (uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -376,7 +365,6 @@ void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel
 }
 
 OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId)
-    throw (uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -384,7 +372,7 @@ OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId)
     return m_pImpl->getLabel(aControlId);
 }
 
-uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw (uno::RuntimeException)
+uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -392,7 +380,7 @@ uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw
     return m_pImpl->getSupportedImageFormats();
 }
 
-sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeException)
+sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -400,7 +388,7 @@ sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeExcepti
     return m_pImpl->getTargetColorDepth();
 }
 
-sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException)
+sal_Int32 SAL_CALL CFilePicker::getAvailableWidth()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -408,7 +396,7 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException
     return m_pImpl->getAvailableWidth();
 }
 
-sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeException)
+sal_Int32 SAL_CALL CFilePicker::getAvailableHeight()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -417,7 +405,6 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeExceptio
 }
 
 void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aImage)
-    throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -425,7 +412,7 @@ void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aIma
     m_pImpl->setImage(aImageFormat, aImage);
 }
 
-sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::RuntimeException)
+sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -433,7 +420,7 @@ sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::Run
     return m_pImpl->setShowState(bShowState);
 }
 
-sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException)
+sal_Bool SAL_CALL CFilePicker::getShowState()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -442,7 +429,6 @@ sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException)
 }
 
 void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
-    throw( uno::Exception, uno::RuntimeException)
 {
     // parameter checking
     uno::Any aAny;
@@ -541,7 +527,6 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
 }
 
 void SAL_CALL CFilePicker::cancel()
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(m_pImpl.get());
 
@@ -552,19 +537,16 @@ void SAL_CALL CFilePicker::cancel()
 // XServiceInfo
 
 OUString SAL_CALL CFilePicker::getImplementationName()
-    throw(uno::RuntimeException)
 {
     return OUString(FILE_PICKER_IMPL_NAME);
 }
 
 sal_Bool SAL_CALL CFilePicker::supportsService(const OUString& ServiceName)
-    throw(uno::RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL CFilePicker::getSupportedServiceNames()
-    throw(uno::RuntimeException)
 {
     return FilePicker_getSupportedServiceNames();
 }
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index aa4d12e25d56..23cddeafadd0 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -62,115 +62,91 @@ public:
 
     // XFilePickerNotifier
 
-    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-        throw( css::uno::RuntimeException ) override;
-    virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-        throw( css::uno::RuntimeException ) 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 ) override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
-    virtual sal_Int16 SAL_CALL execute(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
     // XFilePicker functions
 
-    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) override;
 
-    virtual void SAL_CALL setDefaultName( const OUString& aName )
-        throw( css::uno::RuntimeException ) 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 ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDisplayDirectory(  ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  )
-        throw( css::uno::RuntimeException ) 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 ) 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 ) override;
+    virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) override;
 
-    virtual OUString SAL_CALL getCurrentFilter(  )
-        throw( css::uno::RuntimeException ) 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) 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 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue )
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue ) override;
 
-    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
-        throw (css::uno::RuntimeException) override;
+    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) override;
 
-    virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable )
-        throw(css::uno::RuntimeException ) override;
+    virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable ) override;
 
-    virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel )
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel ) override;
 
-    virtual OUString SAL_CALL getLabel( sal_Int16 aControlId )
-        throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getLabel( sal_Int16 aControlId ) override;
 
     // XFilePreview
 
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  ) override;
 
-    virtual sal_Int32 SAL_CALL getTargetColorDepth(  ) throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getTargetColorDepth(  ) override;
 
-    virtual sal_Int32 SAL_CALL getAvailableWidth(  ) throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getAvailableWidth(  ) override;
 
-    virtual sal_Int32 SAL_CALL getAvailableHeight(  ) throw (css::uno::RuntimeException) 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) 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) override;
+    virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) override;
 
-    virtual sal_Bool SAL_CALL getShowState(  ) throw (css::uno::RuntimeException) 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) 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) override;
+    virtual void SAL_CALL cancel( ) override;
 
     // XEventListener
 
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent )
-        throw(css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent );
 
     // XServiceInfo
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // FilePicker Event functions
 
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index c3e95b51ac1b..43bbbdc7e9dd 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -83,7 +83,6 @@ VistaFilePicker::~VistaFilePicker()
 }
 
 void SAL_CALL VistaFilePicker::addFilePickerListener(const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener)
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_ADD_PICKER_LISTENER);
@@ -93,7 +92,6 @@ void SAL_CALL VistaFilePicker::addFilePickerListener(const css::uno::Reference<
 }
 
 void SAL_CALL VistaFilePicker::removeFilePickerListener(const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_REMOVE_PICKER_LISTENER);
@@ -103,12 +101,10 @@ void SAL_CALL VistaFilePicker::removeFilePickerListener(const css::uno::Referenc
 }
 
 void SAL_CALL VistaFilePicker::disposing(const css::lang::EventObject& /*aEvent*/)
-    throw(css::uno::RuntimeException)
 {
 }
 
 void SAL_CALL VistaFilePicker::setMultiSelectionMode(sal_Bool bMode)
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_SET_MULTISELECTION_MODE);
@@ -118,7 +114,6 @@ void SAL_CALL VistaFilePicker::setMultiSelectionMode(sal_Bool bMode)
 }
 
 void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_SET_TITLE);
@@ -129,8 +124,6 @@ void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)
 
 void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle ,
                                             const OUString& sFilter)
-    throw(css::lang::IllegalArgumentException,
-          css::uno::RuntimeException         )
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTER);
@@ -141,8 +134,6 @@ void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle ,
 }
 
 void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle)
-    throw(css::lang::IllegalArgumentException,
-          css::uno::RuntimeException         )
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_SET_CURRENT_FILTER);
@@ -152,7 +143,6 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle)
 }
 
 OUString SAL_CALL VistaFilePicker::getCurrentFilter()
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_GET_CURRENT_FILTER);
@@ -165,8 +155,6 @@ OUString SAL_CALL VistaFilePicker::getCurrentFilter()
 
 void SAL_CALL VistaFilePicker::appendFilterGroup(const OUString&                              /*sGroupTitle*/,
                                                  const css::uno::Sequence< css::beans::StringPair >& rFilters   )
-    throw (css::lang::IllegalArgumentException,
-           css::uno::RuntimeException         )
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTERGROUP);
@@ -176,7 +164,6 @@ void SAL_CALL VistaFilePicker::appendFilterGroup(const OUString&
 }
 
 void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_SET_DEFAULT_NAME);
@@ -186,8 +173,6 @@ void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )
 }
 
 void SAL_CALL VistaFilePicker::setDisplayDirectory(const OUString& sDirectory)
-    throw (css::lang::IllegalArgumentException,
-           css::uno::RuntimeException         )
 {
     bool bChanged = officecfg::Office::Common::Path::Info::WorkPathChanged::get(
         comphelper::getComponentContext(m_xSMGR));
@@ -210,7 +195,6 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const OUString& sDirectory)
 }
 
 OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY);
@@ -222,7 +206,6 @@ OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
 
 // @deprecated can't be supported any longer ... see IDL description for further details
 css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getFiles()
-    throw(css::uno::RuntimeException)
 {
     css::uno::Sequence< OUString > lFiles = getSelectedFiles();
     // multiselection doesn't really work
@@ -234,7 +217,6 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getFiles()
 }
 
 css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
-    throw(css::uno::RuntimeException, std::exception)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_GET_SELECTED_FILES);
@@ -247,7 +229,6 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
 }
 
 ::sal_Int16 SAL_CALL VistaFilePicker::execute()
-    throw(css::uno::RuntimeException)
 {
     bool bInitialized(false);
     {
@@ -283,7 +264,6 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
 void SAL_CALL VistaFilePicker::setValue(      ::sal_Int16    nControlId    ,
                                               ::sal_Int16    nControlAction,
                                         const css::uno::Any& aValue        )
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_SET_CONTROL_VALUE);
@@ -296,7 +276,6 @@ void SAL_CALL VistaFilePicker::setValue(      ::sal_Int16    nControlId    ,
 
 css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId    ,
                                                  ::sal_Int16 nControlAction)
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_GET_CONTROL_VALUE);
@@ -309,7 +288,6 @@ css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId    ,
 
 void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId,
                                              sal_Bool  bEnable   )
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_ENABLE_CONTROL);
@@ -321,7 +299,6 @@ void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId,
 
 void SAL_CALL VistaFilePicker::setLabel(      ::sal_Int16      nControlId,
                                          const OUString& sLabel    )
-    throw (css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_SET_CONTROL_LABEL);
@@ -332,7 +309,6 @@ void SAL_CALL VistaFilePicker::setLabel(      ::sal_Int16      nControlId,
 }
 
 OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId)
-    throw (css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_GET_CONTROL_LABEL);
@@ -344,51 +320,41 @@ OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId)
 }
 
 css::uno::Sequence< ::sal_Int16 > SAL_CALL VistaFilePicker::getSupportedImageFormats()
-    throw (css::uno::RuntimeException)
 {
     return css::uno::Sequence< sal_Int16 >();
 }
 
 sal_Int32 SAL_CALL VistaFilePicker::getTargetColorDepth()
-    throw (css::uno::RuntimeException)
 {
     return 0;
 }
 
 sal_Int32 SAL_CALL VistaFilePicker::getAvailableWidth()
-    throw (css::uno::RuntimeException)
 {
     return 0;
 }
 
 sal_Int32 SAL_CALL VistaFilePicker::getAvailableHeight()
-    throw (css::uno::RuntimeException)
 {
     return 0;
 }
 
 void SAL_CALL VistaFilePicker::setImage(      sal_Int16      /*nImageFormat*/,
                                          const css::uno::Any& /*aImage      */)
-    throw (css::lang::IllegalArgumentException,
-           css::uno::RuntimeException         )
 {
 }
 
 sal_Bool SAL_CALL VistaFilePicker::setShowState(sal_Bool /*bShowState*/)
-    throw (css::uno::RuntimeException)
 {
     return false;
 }
 
 sal_Bool SAL_CALL VistaFilePicker::getShowState()
-    throw (css::uno::RuntimeException)
 {
     return false;
 }
 
 void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException)
 {
     if (lArguments.getLength() < 1)
         throw css::lang::IllegalArgumentException(
@@ -528,26 +494,22 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An
 }
 
 void SAL_CALL VistaFilePicker::cancel()
-    throw(css::uno::RuntimeException)
 {
 }
 
 // XServiceInfo
 
 OUString SAL_CALL VistaFilePicker::getImplementationName()
-    throw(css::uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.fpicker.VistaFileDialog");
 }
 
 sal_Bool SAL_CALL VistaFilePicker::supportsService(const OUString& sServiceName)
-    throw(css::uno::RuntimeException )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSupportedServiceNames()
-    throw(css::uno::RuntimeException)
 {
     return VistaFilePicker_getSupportedServiceNames();
 }
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index deb15ef6ee3e..946f66efdd6b 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -74,70 +74,52 @@ public:
     // XFilePickerNotifier
 
 
-    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-        throw( css::uno::RuntimeException ) 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 )
-        throw( css::uno::RuntimeException ) 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& sTitle )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setTitle( const OUString& sTitle ) override;
 
-    virtual sal_Int16 SAL_CALL execute(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
 
     // XFilePicker functions
 
 
-    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) override;
 
-    virtual void SAL_CALL setDefaultName( const OUString& sName )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDefaultName( const OUString& sName ) override;
 
-    virtual void SAL_CALL setDisplayDirectory( const OUString& sDirectory )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException         ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& sDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDisplayDirectory(  ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  )
-        throw( css::uno::RuntimeException ) 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& sTitle  ,
-                                        const OUString& sFilter )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException         ) override;
+                                        const OUString& sFilter ) override;
 
-    virtual void SAL_CALL setCurrentFilter( const OUString& sTitle )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException         ) override;
+    virtual void SAL_CALL setCurrentFilter( const OUString& sTitle ) override;
 
-    virtual OUString SAL_CALL getCurrentFilter(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getCurrentFilter(  ) override;
 
 
     // XFilterGroupManager functions
 
 
     virtual void SAL_CALL appendFilterGroup( const OUString&                              sGroupTitle,
-                                             const css::uno::Sequence< css::beans::StringPair >& lFilters   )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException         ) override;
+                                             const css::uno::Sequence< css::beans::StringPair >& lFilters   ) override;
 
 
     // XFilePickerControlAccess functions
@@ -145,84 +127,65 @@ public:
 
     virtual void SAL_CALL setValue(       sal_Int16      nControlId    ,
                                           sal_Int16      nControlAction,
-                                    const css::uno::Any& aValue        )
-        throw (css::uno::RuntimeException) override;
+                                    const css::uno::Any& aValue        ) override;
 
     virtual css::uno::Any SAL_CALL getValue( sal_Int16 nControlId     ,
-                                             sal_Int16 nControlAction )
-        throw (css::uno::RuntimeException) override;
+                                             sal_Int16 nControlAction ) override;
 
     virtual void SAL_CALL enableControl( sal_Int16 nControlId,
-                                         sal_Bool  bEnable   )
-        throw(css::uno::RuntimeException ) override;
+                                         sal_Bool  bEnable   ) override;
 
     virtual void SAL_CALL setLabel(       sal_Int16        nControlId,
-                                    const OUString& sLabel    )
-        throw (css::uno::RuntimeException) override;
+                                    const OUString& sLabel    ) override;
 
-    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
-        throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) override;
 
 
     // XFilePreview
 
 
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  )
-        throw (css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  ) override;
 
-    virtual sal_Int32 SAL_CALL getTargetColorDepth(  )
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getTargetColorDepth(  ) override;
 
-    virtual sal_Int32 SAL_CALL getAvailableWidth(  )
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getAvailableWidth(  ) override;
 
-    virtual sal_Int32 SAL_CALL getAvailableHeight(  )
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getAvailableHeight(  ) override;
 
     virtual void SAL_CALL setImage(       sal_Int16      nImageFormat,
-                                    const css::uno::Any& aImage      )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
+                                    const css::uno::Any& aImage      ) override;
 
-    virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState )
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) override;
 
-    virtual sal_Bool SAL_CALL getShowState(  )
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL getShowState(  ) override;
 
 
     // XInitialization
 
 
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments )
-        throw(css::uno::Exception       ,
-              css::uno::RuntimeException) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) override;
 
 
     // XCancellable
 
 
-    virtual void SAL_CALL cancel( )
-        throw(css::uno::RuntimeException) override;
+    virtual void SAL_CALL cancel( ) override;
 
 
     // XEventListener
 
-
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent )
-        throw(css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent );
 
 
     // XServiceInfo
 
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     /*
 
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index ff02fafd5ca2..6233f0e17693 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -205,14 +205,12 @@ STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomi
 
 
 void SAL_CALL VistaFilePickerEventHandler::addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-    throw( css::uno::RuntimeException )
 {
     m_lListener.addInterface(cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get(), xListener);
 }
 
 
 void SAL_CALL VistaFilePickerEventHandler::removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-    throw( css::uno::RuntimeException )
 {
     m_lListener.removeInterface(cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get(), xListener);
 }
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index 1fa0c6909519..329e7264c9c6 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -115,12 +115,11 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
 
         // XFilePickerNotifier
 
+        /// @throws css::uno::RuntimeException
+        virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener );
 
-        virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-            throw( css::uno::RuntimeException );
-
-        virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-            throw( css::uno::RuntimeException );
+        /// @throws css::uno::RuntimeException
+        virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener );
 
 
         // native interface
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 4ec7dd2c2183..30f20acfee94 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -94,7 +94,6 @@ CWinFileOpenImpl::~CWinFileOpenImpl()
 // we expect the directory in URL format
 
 void CWinFileOpenImpl::setDisplayDirectory(const OUString& aDirectory)
-    throw( IllegalArgumentException, uno::RuntimeException )
 {
     OUString aSysDirectory;
     if( aDirectory.getLength() > 0)
@@ -121,13 +120,12 @@ void CWinFileOpenImpl::setDisplayDirectory(const OUString& aDirectory)
 
 // we return the directory in URL format
 
-OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeException)
+OUString CWinFileOpenImpl::getDisplayDirectory()
 {
     return m_FilePickerState->getDisplayDirectory(this);
 }
 
 void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName)
-    throw( IllegalArgumentException, uno::RuntimeException )
 {
     // we don't set the default name directly
     // because this influences how the file open
@@ -146,14 +144,13 @@ void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName)
 //    the first entry is the path url, all other entries are file names
 
 uno::Sequence<OUString> SAL_CALL CWinFileOpenImpl::getFiles()
-    throw(uno::RuntimeException)
 {
     return m_FilePickerState->getFiles(this);
 }
 
 // shows the FileOpen/FileSave dialog
 
-sal_Int16 SAL_CALL CWinFileOpenImpl::execute(  ) throw(uno::RuntimeException)
+sal_Int16 SAL_CALL CWinFileOpenImpl::execute(  )
 {
     sal_Int16 rc = CFileOpenDialog::doModal();
 
@@ -174,7 +171,6 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute(  ) throw(uno::RuntimeException)
 // empty
 
 void SAL_CALL CWinFileOpenImpl::appendFilter(const OUString& aTitle, const OUString& aFilter)
-    throw(IllegalArgumentException, uno::RuntimeException)
 {
     bool bRet = m_filterContainer->addFilter(aTitle, aFilter);
 
@@ -197,7 +193,6 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const OUString& aTitle, const OUStr
 // sets a current filter
 
 void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const OUString& aTitle)
-    throw( IllegalArgumentException, uno::RuntimeException)
 {
     sal_Int32 filterPos = m_filterContainer->getFilterPos(aTitle);
 
@@ -212,7 +207,7 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const OUString& aTitle)
 
 // returns the currently selected filter
 
-OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeException)
+OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter()
 {
     sal_uInt32 nIndex = getSelectedFilterIndex();
 
@@ -236,7 +231,6 @@ inline void SAL_CALL CWinFileOpenImpl::appendFilterGroupSeparator()
 // XFilterGroupManager
 
 void SAL_CALL CWinFileOpenImpl::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
-    throw (IllegalArgumentException, uno::RuntimeException)
 {
     (void) sGroupTitle; // avoid warning
     OSL_ENSURE(0 == sGroupTitle.getLength(), "appendFilterGroup: Parameter 'GroupTitle' currently ignored");
@@ -272,7 +266,6 @@ static bool filterControlCommand( sal_Int16 nControlId )
 }
 
 void SAL_CALL CWinFileOpenImpl::setValue(sal_Int16 aControlId, sal_Int16 aControlAction, const uno::Any& aValue)
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(m_FilePickerState);
     if ( !filterControlCommand( aControlId ))
@@ -283,7 +276,6 @@ void SAL_CALL CWinFileOpenImpl::setValue(sal_Int16 aControlId, sal_Int16 aContro
 // we assume that there are only checkboxes or comboboxes
 
 uno::Any SAL_CALL CWinFileOpenImpl::getValue(sal_Int16 aControlId, sal_Int16 aControlAction)
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(m_FilePickerState);
     if ( !filterControlCommand( aControlId ))
@@ -295,7 +287,6 @@ uno::Any SAL_CALL CWinFileOpenImpl::getValue(sal_Int16 aControlId, sal_Int16 aCo
 // enables a custom template element
 
 void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, bool bEnable)
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(m_FilePickerState);
     if ( !filterControlCommand( ControlID ))
@@ -303,7 +294,6 @@ void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, bool bEnable)
 }
 
 void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString& aLabel )
-    throw (uno::RuntimeException)
 {
     OSL_ASSERT(m_FilePickerState);
     if ( !filterControlCommand( aControlId ))
@@ -311,7 +301,6 @@ void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString&
 }
 
 OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId )
-        throw (uno::RuntimeException)
 {
     OSL_ASSERT(m_FilePickerState);
     if ( !filterControlCommand( aControlId ))
@@ -321,43 +310,36 @@ OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId )
 }
 
 uno::Sequence<sal_Int16> SAL_CALL CWinFileOpenImpl::getSupportedImageFormats()
-    throw (uno::RuntimeException)
 {
     return CPreviewAdapter::getSupportedImageFormats();
 }
 
 sal_Int32 SAL_CALL CWinFileOpenImpl::getTargetColorDepth()
-    throw (uno::RuntimeException)
 {
     return m_Preview->getTargetColorDepth();
 }
 
 sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableWidth()
-        throw (uno::RuntimeException)
 {
     return m_Preview->getAvailableWidth();
 }
 
 sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableHeight()
-    throw (uno::RuntimeException)
 {
     return m_Preview->getAvailableHeight();
 }
 
 void SAL_CALL CWinFileOpenImpl::setImage(sal_Int16 aImageFormat, const uno::Any& aImage)
-    throw (IllegalArgumentException, uno::RuntimeException)
 {
     m_Preview->setImage(aImageFormat,aImage);
 }
 
 bool SAL_CALL CWinFileOpenImpl::setShowState(bool bShowState)
-        throw (uno::RuntimeException)
 {
     return m_Preview->setShowState(bShowState);
 }
 
 bool SAL_CALL CWinFileOpenImpl::getShowState()
-    throw (uno::RuntimeException)
 {
     return m_Preview->getShowState();
 }
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index b6e78f50c850..634f2834fc58 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -55,76 +55,80 @@ public:
 
     // XExecutableDialog
 
-    virtual sal_Int16 SAL_CALL execute(  ) throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int16 SAL_CALL execute(  );
 
     // XFilePicker
 
-    virtual void SAL_CALL setDefaultName( const OUString& aName )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDefaultName( const OUString& aName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  )
-        throw(css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  );
 
-    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory( ) throw ( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual OUString SAL_CALL getDisplayDirectory( );
 
     // XFilterManager
 
-    virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter );
 
-    virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL setCurrentFilter( const OUString& aTitle );
 
-    virtual OUString  SAL_CALL getCurrentFilter( )
-        throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual OUString  SAL_CALL getCurrentFilter( );
 
     // XFilterGroupManager
 
-    virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters );
 
     // XFilePickerControlAccess
 
-    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue )
-        throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue );
 
-    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
-        throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction );
 
-    virtual void SAL_CALL enableControl( sal_Int16 aControlId, bool bEnable )
-        throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL enableControl( sal_Int16 aControlId, bool bEnable );
 
-    virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel );
 
-    virtual OUString SAL_CALL getLabel( sal_Int16 aControlId )
-        throw ( css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual OUString SAL_CALL getLabel( sal_Int16 aControlId );
 
     // XFilePreview
 
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  );
 
-    virtual sal_Int32 SAL_CALL getTargetColorDepth( )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int32 SAL_CALL getTargetColorDepth( );
 
-    virtual sal_Int32 SAL_CALL getAvailableWidth( )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int32 SAL_CALL getAvailableWidth( );
 
-    virtual sal_Int32 SAL_CALL getAvailableHeight( )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int32 SAL_CALL getAvailableHeight( );
 
-    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage );
 
-    virtual bool SAL_CALL setShowState( bool bShowState )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual bool SAL_CALL setShowState( bool bShowState );
 
-    virtual bool SAL_CALL getShowState( )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual bool SAL_CALL getShowState( );
 
     // XCancelable
 
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index 86201a438fb6..6db7df14a048 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -94,7 +94,7 @@ CDIBPreview::~CDIBPreview( )
 }
 
 
-sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth() throw (RuntimeException)
+sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth()
 {
     HDC hdc = GetDC(m_Hwnd);
     int clrRes = 0;
@@ -106,7 +106,7 @@ sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth() throw (RuntimeException)
 }
 
 
-sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth() throw (RuntimeException)
+sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth()
 {
     RECT rect;
     bool bRet = GetClientRect(m_Hwnd,&rect);
@@ -120,7 +120,7 @@ sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth() throw (RuntimeException)
 }
 
 
-sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight() throw (RuntimeException)
+sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight()
 {
     RECT rect;
     bool bRet = GetClientRect(m_Hwnd,&rect);
@@ -135,7 +135,6 @@ sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight() throw (RuntimeException)
 
 
 void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage)
-    throw (IllegalArgumentException, RuntimeException)
 {
     PreviewBase::setImage(aImageFormat,aImage);
 
@@ -154,7 +153,7 @@ void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage)
 }
 
 
-bool SAL_CALL CDIBPreview::setShowState(bool bShowState) throw (RuntimeException)
+bool SAL_CALL CDIBPreview::setShowState(bool bShowState)
 {
     PreviewBase::setShowState(bShowState);
     ShowWindow(m_Hwnd, m_bShowState ? SW_SHOW : SW_HIDE);
@@ -162,7 +161,7 @@ bool SAL_CALL CDIBPreview::setShowState(bool bShowState) throw (RuntimeException
 }
 
 
-bool SAL_CALL CDIBPreview::getShowState() throw (RuntimeException)
+bool SAL_CALL CDIBPreview::getShowState()
 {
     return bool(IsWindowVisible(m_Hwnd));
 }
diff --git a/fpicker/source/win32/filepicker/dibpreview.hxx b/fpicker/source/win32/filepicker/dibpreview.hxx
index 76f74bbb056c..fb34f911cbbf 100644
--- a/fpicker/source/win32/filepicker/dibpreview.hxx
+++ b/fpicker/source/win32/filepicker/dibpreview.hxx
@@ -54,23 +54,17 @@ public:
 
     // preview interface implementation
 
-    virtual sal_Int32 SAL_CALL getTargetColorDepth()
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getTargetColorDepth() override;
 
-    virtual sal_Int32 SAL_CALL getAvailableWidth()
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getAvailableWidth() override;
 
-    virtual sal_Int32 SAL_CALL getAvailableHeight()
-        throw (css::uno::RuntimeException) 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) override;
+    virtual void SAL_CALL setImage(sal_Int16 aImageFormat, const css::uno::Any& aImage) override;
 
-    virtual bool SAL_CALL setShowState(bool bShowState)
-        throw (css::uno::RuntimeException) override;
+    virtual bool SAL_CALL setShowState(bool bShowState) override;
 
-    virtual bool SAL_CALL getShowState()
-        throw (css::uno::RuntimeException) override;
+    virtual bool SAL_CALL getShowState() override;
 
     virtual HWND SAL_CALL getWindowHandle() const override;
 
diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index 851f68b4c231..2eeb61da15b8 100644
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -50,8 +50,9 @@ public:
 
     virtual sal_Int32 SAL_CALL getAvailableHeight();
 
-    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const Any& aImage )
-        throw (IllegalArgumentException,RuntimeException);
+    /// @throws IllegalArgumentException
+    /// @throws RuntimeException
+    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const Any& aImage );
 
     virtual bool SAL_CALL setShowState(bool bShowState);
 
@@ -76,7 +77,8 @@ protected:
 
     virtual void SAL_CALL rearrangeLayout();
 
-    void SAL_CALL initializeActivePreview() throw(std::runtime_error);
+    /// @throws std::runtime_error
+    void SAL_CALL initializeActivePreview();
 
     HWND SAL_CALL findFileListbox() const;
 
@@ -127,7 +129,6 @@ sal_Int32 SAL_CALL CPreviewAdapterImpl::getAvailableHeight()
 
 
 void SAL_CALL CPreviewAdapterImpl::setImage( sal_Int16 aImageFormat, const Any& aImage )
-    throw (IllegalArgumentException,RuntimeException)
 {
     m_Preview->setImage(aImageFormat,aImage);
 }
@@ -299,7 +300,7 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
 }
 
 
-void SAL_CALL CPreviewAdapterImpl::initializeActivePreview() throw(std::runtime_error)
+void SAL_CALL CPreviewAdapterImpl::initializeActivePreview()
 {
     bool bShowState = m_Preview->getImaginaryShowState();
 
@@ -411,7 +412,6 @@ sal_Int32 SAL_CALL CPreviewAdapter::getAvailableHeight()
 
 
 void SAL_CALL CPreviewAdapter::setImage( sal_Int16 aImageFormat, const Any& aImage )
-    throw (IllegalArgumentException, RuntimeException)
 {
     m_pImpl->setImage(aImageFormat,aImage);
 }
diff --git a/fpicker/source/win32/filepicker/previewadapter.hxx b/fpicker/source/win32/filepicker/previewadapter.hxx
index 33f5ef54fa0d..1f14098ae849 100644
--- a/fpicker/source/win32/filepicker/previewadapter.hxx
+++ b/fpicker/source/win32/filepicker/previewadapter.hxx
@@ -62,8 +62,9 @@ public:
 
     sal_Int32 SAL_CALL getAvailableHeight();
 
-    void SAL_CALL setImage(sal_Int16 aImageFormat, const css::uno::Any& aImage)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::uno::RuntimeException
+    void SAL_CALL setImage(sal_Int16 aImageFormat, const css::uno::Any& aImage);
 
     bool SAL_CALL setShowState(bool bShowState);
 
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index 8c158b2df4fa..ade90668d016 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -38,26 +38,25 @@ PreviewBase::~PreviewBase()
 }
 
 
-sal_Int32 SAL_CALL PreviewBase::getTargetColorDepth() throw (RuntimeException)
+sal_Int32 SAL_CALL PreviewBase::getTargetColorDepth()
 {
     return 0;
 }
 
 
-sal_Int32 SAL_CALL PreviewBase::getAvailableWidth() throw (RuntimeException)
+sal_Int32 SAL_CALL PreviewBase::getAvailableWidth()
 {
     return 0;
 }
 
 
-sal_Int32 SAL_CALL PreviewBase::getAvailableHeight() throw (RuntimeException)
+sal_Int32 SAL_CALL PreviewBase::getAvailableHeight()
 {
     return 0;
 }
 
 
 void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage )
-    throw (IllegalArgumentException, RuntimeException)
 {
     if (aImageFormat != css::ui::dialogs::FilePreviewImageFormats::BITMAP)
         throw IllegalArgumentException(
@@ -80,14 +79,14 @@ void SAL_CALL PreviewBase::getImage(sal_Int16& aImageFormat,css::uno::Any& aImag
 }
 
 
-bool SAL_CALL PreviewBase::setShowState( bool bShowState ) throw (RuntimeException)
+bool SAL_CALL PreviewBase::setShowState( bool bShowState )
 {
     m_bShowState = bShowState;
     return true;
 }
 
 
-bool SAL_CALL PreviewBase::getShowState() throw (RuntimeException)
+bool SAL_CALL PreviewBase::getShowState()
 {
     return false;
 }
diff --git a/fpicker/source/win32/filepicker/previewbase.hxx b/fpicker/source/win32/filepicker/previewbase.hxx
index 20d04dc50db2..503b541457f5 100644
--- a/fpicker/source/win32/filepicker/previewbase.hxx
+++ b/fpicker/source/win32/filepicker/previewbase.hxx
@@ -45,23 +45,24 @@ public:
     // dtor
     virtual ~PreviewBase();
 
-    virtual sal_Int32 SAL_CALL getTargetColorDepth()
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int32 SAL_CALL getTargetColorDepth();
 
-    virtual sal_Int32 SAL_CALL getAvailableWidth()
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int32 SAL_CALL getAvailableWidth();
 
-    virtual sal_Int32 SAL_CALL getAvailableHeight()
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int32 SAL_CALL getAvailableHeight();
 
-    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage );
 
-    virtual bool SAL_CALL setShowState( bool bShowState )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual bool SAL_CALL setShowState( bool bShowState );
 
-    virtual bool SAL_CALL getShowState()
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual bool SAL_CALL getShowState();
 
     virtual void SAL_CALL getImage(sal_Int16& aImageFormat,css::uno::Any& aImage);
 
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index 28f4a257e7fa..18bac1135913 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -51,7 +51,7 @@ CFolderPicker::CFolderPicker( const Reference< XMultiServiceFactory >& xServiceM
     m_pFolderPickerImpl = std::unique_ptr< CWinFolderPickerImpl > ( new CWinFolderPickerImpl( this ) );
 }
 
-void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle ) throw( RuntimeException )
+void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle )
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
     MutexGuard aGuard( m_aMutex );
@@ -59,7 +59,6 @@ void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle ) throw( RuntimeEx
 }
 
 void SAL_CALL CFolderPicker::setDisplayDirectory( const OUString& aDirectory )
-    throw( IllegalArgumentException, RuntimeException )
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
     MutexGuard aGuard( m_aMutex );
@@ -67,21 +66,20 @@ void SAL_CALL CFolderPicker::setDisplayDirectory( const OUString& aDirectory )
 }
 
 OUString SAL_CALL CFolderPicker::getDisplayDirectory( )
-    throw( RuntimeException )
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
     MutexGuard aGuard( m_aMutex );
     return m_pFolderPickerImpl->getDisplayDirectory( );
 }
 
-OUString SAL_CALL CFolderPicker::getDirectory( ) throw( RuntimeException )
+OUString SAL_CALL CFolderPicker::getDirectory( )
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
     MutexGuard aGuard( m_aMutex );
     return m_pFolderPickerImpl->getDirectory( );
 }
 
-void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription ) throw( RuntimeException )
+void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription )
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
     MutexGuard aGuard( m_aMutex );
@@ -89,7 +87,6 @@ void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription ) thro
 }
 
 sal_Int16 SAL_CALL CFolderPicker::execute( )
-    throw( RuntimeException )
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
 
@@ -103,19 +100,16 @@ sal_Int16 SAL_CALL CFolderPicker::execute( )
 // XServiceInfo
 
 OUString SAL_CALL CFolderPicker::getImplementationName(  )
-    throw( RuntimeException )
 {
     return OUString( FOLDERPICKER_IMPL_NAME );
 }
 
 sal_Bool SAL_CALL CFolderPicker::supportsService( const OUString& ServiceName )
-    throw( RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL CFolderPicker::getSupportedServiceNames(   )
-    throw( RuntimeException )
 {
     return FolderPicker_getSupportedServiceNames();
 }
@@ -123,7 +117,6 @@ Sequence< OUString > SAL_CALL CFolderPicker::getSupportedServiceNames(   )
 //  XCancellable
 
 void SAL_CALL CFolderPicker::cancel( )
-    throw(RuntimeException)
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
     MutexGuard aGuard( m_aMutex );
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 8f64c889e5cb..2f25cc4a4ecf 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -49,47 +49,37 @@ public:
     // XExecutableDialog
 
 
-    virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
-    virtual sal_Int16 SAL_CALL execute(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
 
     // XFolderPicker functions
 
 
-    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDisplayDirectory(  ) override;
 
-    virtual OUString SAL_CALL getDirectory( )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDirectory( ) override;
 
-    virtual void SAL_CALL setDescription( const OUString& aDescription )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDescription( const OUString& aDescription ) override;
 
 
     // XServiceInfo
 
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 
     // XCancellable
 
 
-    virtual void SAL_CALL cancel( )
-        throw(css::uno::RuntimeException) override;
+    virtual void SAL_CALL cancel( ) override;
 
 
     // overwrite base class method, which is called
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index c5dd9b5ab6d5..5b427e3194c9 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -48,7 +48,6 @@ CWinFolderPickerImpl::CWinFolderPickerImpl( CFolderPicker* aFolderPicker ) :
 // OS the FolderPicker starts in the root of the file system hierarchy
 
 void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirectory )
-    throw( IllegalArgumentException, RuntimeException )
 {
     OUString sysDir;
 
@@ -82,7 +81,6 @@ void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirect
 // we return the directory in URL format
 
 OUString CWinFolderPickerImpl::getDisplayDirectory( )
-    throw( RuntimeException )
 {
     // call base class method to get the directory in system format
     OUString displayDirectory = CMtaFolderPicker::getDisplayDirectory( );
@@ -94,7 +92,7 @@ OUString CWinFolderPickerImpl::getDisplayDirectory( )
     return displayDirectoryURL;
 }
 
-OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException )
+OUString SAL_CALL CWinFolderPickerImpl::getDirectory( )
 {
     OUString sysDir = CMtaFolderPicker::getDirectory( );
     OUString dirURL;
@@ -105,7 +103,7 @@ OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException
     return dirURL;
 }
 
-sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( ) throw( RuntimeException )
+sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( )
 {
     return m_nLastDlgResult = CMtaFolderPicker::browseForFolder( ) ?
         css::ui::dialogs::ExecutableDialogResults::OK :
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
index b6b867865b29..ffed7e969342 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
@@ -38,22 +38,18 @@ public:
 
     // XExecutableDialog
 
-
-    virtual sal_Int16 SAL_CALL execute(  )
-        throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int16 SAL_CALL execute(  );
 
 
     // XFolderPicker
 
 
-    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory( )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDisplayDirectory( ) override;
 
-    virtual OUString SAL_CALL getDirectory( )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDirectory( ) override;
 
 protected:
     virtual void SAL_CALL onSelChanged( const OUString& aNewPath ) override;
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index b81750a80173..105045e4e467 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -117,7 +117,6 @@ OUString SAL_CALL ListboxGetString( HWND hwnd, sal_Int32 aPosition )
 }
 
 void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
 
@@ -135,7 +134,6 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt
 }
 
 void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
 
@@ -157,7 +155,6 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference<
 }
 
 void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
 
@@ -185,7 +182,6 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
 }
 
 void SAL_CALL ListboxDeleteItems( HWND hwnd, const Any&, const Reference< XInterface >&, sal_Int16 )
-    throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
 
@@ -201,7 +197,6 @@ void SAL_CALL ListboxDeleteItems( HWND hwnd, const Any&, const Reference< XInter
 }
 
 void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
 
@@ -282,7 +277,6 @@ Any SAL_CALL CheckboxGetState( HWND hwnd )
 
 void SAL_CALL CheckboxSetState(
     HWND hwnd, const css::uno::Any& aState, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
 
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index a5ac793cef95..369e127bd48a 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
@@ -37,25 +37,25 @@
 bool SAL_CALL IsWindowsVistaOrNewer();
 
 // set actions
+/// @throws css::lang::IllegalArgumentException
 void SAL_CALL ListboxAddItem(
-    HWND hwnd, const css::uno::Any& aItem, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( css::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aItem, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos );
 
+/// @throws css::lang::IllegalArgumentException
 void SAL_CALL ListboxAddItems(
-    HWND hwnd, const css::uno::Any& aItemList, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( css::lang:: IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aItemList, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos );
 
+/// @throws css::lang::IllegalArgumentException
 void SAL_CALL ListboxDeleteItem(
-    HWND hwnd, const css::uno::Any& aPosition, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( css::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aPosition, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos );
 
+/// @throws css::lang::IllegalArgumentException
 void SAL_CALL ListboxDeleteItems(
-    HWND hwnd, const css::uno::Any& aUnused, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( css::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aUnused, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos );
 
+/// @throws css::lang::IllegalArgumentException
 void SAL_CALL ListboxSetSelectedItem(
-    HWND hwnd, const css::uno::Any& aPosition, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( css::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aPosition, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos );
 
 // get actions
 css::uno::Any SAL_CALL ListboxGetItems( HWND hwnd );
@@ -65,9 +65,9 @@ css::uno::Any SAL_CALL ListboxGetSelectedItemIndex( HWND hwnd );
 // checkbox helper functions
 css::uno::Any SAL_CALL CheckboxGetState( HWND hwnd );
 
+/// @throws css::lang::IllegalArgumentException
 void SAL_CALL CheckboxSetState(
-    HWND hwnd, const css::uno::Any& aState, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( css::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aState, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos );
 
 // calculates the length of '\0' separated and '\0\0'
 // ending strings used in some Win32 functions