diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
tree | bcce66b27261553c308779f3e8663a269ed3a671 /fpicker/source/aqua | |
parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff) |
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>
Diffstat (limited to 'fpicker/source/aqua')
-rw-r--r-- | fpicker/source/aqua/FilterHelper.hxx | 12 | ||||
-rw-r--r-- | fpicker/source/aqua/FilterHelper.mm | 4 | ||||
-rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.hxx | 76 | ||||
-rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.mm | 34 | ||||
-rw-r--r-- | fpicker/source/aqua/SalAquaFolderPicker.hxx | 33 | ||||
-rw-r--r-- | fpicker/source/aqua/SalAquaFolderPicker.mm | 16 | ||||
-rw-r--r-- | fpicker/source/aqua/SalAquaPicker.hxx | 9 | ||||
-rw-r--r-- | fpicker/source/aqua/SalAquaPicker.mm | 5 |
8 files changed, 59 insertions, 130 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; |