14 files changed, 169 insertions, 309 deletions

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);