diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /fpicker | |
parent | Fixup whitespace changes, remove commented code. (diff) | |
download | core-5e21a413c788f839a66d9e4c14e745ed18058db8.tar.gz core-5e21a413c788f839a66d9e4c14e745ed18058db8.zip |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'fpicker')
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 60 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.hxx | 68 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFolderPicker.cxx | 24 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFolderPicker.hxx | 24 | ||||
-rw-r--r-- | fpicker/source/office/commonpicker.cxx | 26 | ||||
-rw-r--r-- | fpicker/source/office/commonpicker.hxx | 26 | ||||
-rw-r--r-- | fpicker/source/office/fpinteraction.cxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/fpinteraction.hxx | 2 |
8 files changed, 116 insertions, 116 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 6361f50f4dd1..82ff53c013e0 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -497,13 +497,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvtFilePicker, OCommonPicker, SvtFilePicker_Ba -void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle ) throw (RuntimeException) +void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception) { OCommonPicker::setTitle( _rTitle ); } -sal_Int16 SAL_CALL SvtFilePicker::execute( ) throw (RuntimeException) +sal_Int16 SAL_CALL SvtFilePicker::execute( ) throw (RuntimeException, std::exception) { return OCommonPicker::execute(); } @@ -513,7 +513,7 @@ sal_Int16 SAL_CALL SvtFilePicker::execute( ) throw (RuntimeException) -void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) throw (RuntimeException) +void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception) { setTitle( _rTitle ); } @@ -534,7 +534,7 @@ void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< ::com::sun::sta // XFilePicker functions -void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( RuntimeException ) +void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( RuntimeException, std::exception ) { checkAlive(); @@ -542,7 +542,7 @@ void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( Runt m_bMultiSelection = bMode; } -void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName ) throw( RuntimeException ) +void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName ) throw( RuntimeException, std::exception ) { checkAlive(); @@ -551,7 +551,7 @@ void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName ) throw( Runt } void SAL_CALL SvtFilePicker::setDisplayDirectory( const OUString& aDirectory ) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { checkAlive(); @@ -559,7 +559,7 @@ void SAL_CALL SvtFilePicker::setDisplayDirectory( const OUString& aDirectory ) m_aDisplayDirectory = aDirectory; } -OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeException ) +OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeException, std::exception ) { checkAlive(); @@ -587,7 +587,7 @@ OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeException ) return m_aDisplayDirectory; } -Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException ) +Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException, std::exception ) { checkAlive(); @@ -632,7 +632,7 @@ Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID, sal_Int16 nControlAction, const Any& rValue ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { checkAlive(); @@ -676,7 +676,7 @@ void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID, Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAction ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { checkAlive(); @@ -712,7 +712,7 @@ Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAc void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValue ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { checkAlive(); @@ -752,7 +752,7 @@ void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValu OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { checkAlive(); @@ -785,7 +785,7 @@ OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID ) void SAL_CALL SvtFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnable ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { checkAlive(); @@ -827,7 +827,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 ) +void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePickerListener >& xListener ) throw ( RuntimeException, std::exception ) { checkAlive(); @@ -836,7 +836,7 @@ void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePicker } -void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePickerListener >& ) throw ( RuntimeException ) +void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePickerListener >& ) throw ( RuntimeException, std::exception ) { checkAlive(); @@ -849,7 +849,7 @@ void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePic Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { checkAlive(); @@ -862,7 +862,7 @@ Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats() } -sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException ) +sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException, std::exception ) { checkAlive(); @@ -876,7 +876,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException } -sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException ) +sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException, std::exception ) { checkAlive(); @@ -890,7 +890,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException ) } -sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException ) +sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException, std::exception ) { checkAlive(); @@ -905,7 +905,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage ) - throw ( IllegalArgumentException, RuntimeException ) + throw ( IllegalArgumentException, RuntimeException, std::exception ) { checkAlive(); @@ -916,7 +916,7 @@ void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool bShowState ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { checkAlive(); @@ -930,7 +930,7 @@ sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool bShowState ) } -sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException ) +sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException, std::exception ) { checkAlive(); @@ -949,7 +949,7 @@ sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException ) void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle, const Sequence< StringPair >& aFilters ) - throw ( IllegalArgumentException, RuntimeException ) + throw ( IllegalArgumentException, RuntimeException, std::exception ) { checkAlive(); @@ -977,7 +977,7 @@ void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle, void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { checkAlive(); @@ -996,7 +996,7 @@ void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle, void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle ) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { checkAlive(); @@ -1012,7 +1012,7 @@ void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle ) OUString SAL_CALL SvtFilePicker::getCurrentFilter() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { checkAlive(); @@ -1028,7 +1028,7 @@ OUString SAL_CALL SvtFilePicker::getCurrentFilter() void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments ) - throw ( Exception, RuntimeException ) + throw ( Exception, RuntimeException, std::exception ) { checkAlive(); @@ -1112,19 +1112,19 @@ sal_Bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName /* XServiceInfo */ -OUString SAL_CALL SvtFilePicker::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL SvtFilePicker::getImplementationName() throw( RuntimeException, std::exception ) { return impl_getStaticImplementationName(); } /* XServiceInfo */ -sal_Bool SAL_CALL SvtFilePicker::supportsService( const OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SvtFilePicker::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } /* XServiceInfo */ -Sequence< OUString > SAL_CALL SvtFilePicker::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL SvtFilePicker::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return impl_getStaticSupportedServiceNames(); } diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 2f357d886cf5..47f0de412c44 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -99,13 +99,13 @@ public: // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAsynchronousExecutableDialog functions - virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -114,82 +114,82 @@ public: // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDefaultName( const OUString& aName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setDefaultName( const OUString& aName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const com::sun::star::uno::Any& value ) throw( ::com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setLabel( sal_Int16 ElementID, const OUString& aValue ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getLabel( sal_Int16 ElementID ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL enableControl( sal_Int16 ElementID, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const com::sun::star::uno::Any& value ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setLabel( sal_Int16 ElementID, const OUString& aValue ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getLabel( sal_Int16 ElementID ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL enableControl( sal_Int16 ElementID, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilePickerNotifier functions - virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilePreview functions - virtual com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Int32 SAL_CALL getTargetColorDepth() throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Int32 SAL_CALL getAvailableWidth() throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Int32 SAL_CALL getAvailableHeight() throw ( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const com::sun::star::uno::Any& aImage ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL getShowState() throw ( ::com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getTargetColorDepth() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getAvailableWidth() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getAvailableHeight() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const com::sun::star::uno::Any& aImage ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL getShowState() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); // these methods are here because they're ambiguous - virtual void SAL_CALL cancel() throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL cancel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::svt::OCommonPicker::cancel(); } - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::svt::OCommonPicker::dispose(); } - virtual void SAL_CALL addEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL addEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::svt::OCommonPicker::addEventListener(l); } - virtual void SAL_CALL removeEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL removeEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::svt::OCommonPicker::removeEventListener(l); } // XInitialization functions - virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw ( com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw ( com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo functions /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); /* Helper for XServiceInfo */ static com::sun::star::uno::Sequence< OUString > diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index 37274d831e4b..5f54ec2cfb5c 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -45,22 +45,22 @@ SvtFolderPicker::~SvtFolderPicker() { } -void SAL_CALL SvtFolderPicker::setTitle( const OUString& _rTitle ) throw (RuntimeException) +void SAL_CALL SvtFolderPicker::setTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception) { OCommonPicker::setTitle( _rTitle ); } -sal_Int16 SAL_CALL SvtFolderPicker::execute( ) throw (RuntimeException) +sal_Int16 SAL_CALL SvtFolderPicker::execute( ) throw (RuntimeException, std::exception) { return OCommonPicker::execute(); } -void SAL_CALL SvtFolderPicker::setDialogTitle( const OUString& _rTitle) throw (RuntimeException) +void SAL_CALL SvtFolderPicker::setDialogTitle( const OUString& _rTitle) throw (RuntimeException, std::exception) { setTitle( _rTitle ); } -void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (RuntimeException) +void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (RuntimeException, std::exception) { m_xListener = xListener; prepareDialog(); @@ -111,12 +111,12 @@ IMPL_LINK( SvtFolderPicker, DialogClosedHdl, Dialog*, pDlg ) } void SAL_CALL SvtFolderPicker::setDisplayDirectory( const OUString& aDirectory ) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { m_aDisplayDirectory = aDirectory; } -OUString SAL_CALL SvtFolderPicker::getDisplayDirectory() throw( RuntimeException ) +OUString SAL_CALL SvtFolderPicker::getDisplayDirectory() throw( RuntimeException, std::exception ) { if ( ! getDialog() ) return m_aDisplayDirectory; @@ -129,7 +129,7 @@ OUString SAL_CALL SvtFolderPicker::getDisplayDirectory() throw( RuntimeException return OUString(); } -OUString SAL_CALL SvtFolderPicker::getDirectory() throw( RuntimeException ) +OUString SAL_CALL SvtFolderPicker::getDirectory() throw( RuntimeException, std::exception ) { if ( ! getDialog() ) return m_aDisplayDirectory; @@ -143,30 +143,30 @@ OUString SAL_CALL SvtFolderPicker::getDirectory() throw( RuntimeException ) } void SAL_CALL SvtFolderPicker::setDescription( const OUString& aDescription ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { m_aDescription = aDescription; } -void SvtFolderPicker::cancel() throw (RuntimeException) +void SvtFolderPicker::cancel() throw (RuntimeException, std::exception) { OCommonPicker::cancel(); } /* XServiceInfo */ -OUString SAL_CALL SvtFolderPicker::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL SvtFolderPicker::getImplementationName() throw( RuntimeException, std::exception ) { return impl_getStaticImplementationName(); } /* XServiceInfo */ -sal_Bool SAL_CALL SvtFolderPicker::supportsService( const OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SvtFolderPicker::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } /* XServiceInfo */ -Sequence< OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return impl_getStaticSupportedServiceNames(); } diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx index a33bb586718a..0842c21bf920 100644 --- a/fpicker/source/office/OfficeFolderPicker.hxx +++ b/fpicker/source/office/OfficeFolderPicker.hxx @@ -56,35 +56,35 @@ public: // XFolderPicker2 functions - virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getDirectory() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDescription( const OUString& aDescription ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setDescription( const OUString& aDescription ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL cancel() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAsynchronousExecutableDialog functions - virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo functions /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); /* Helper for XServiceInfo */ static com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 356c87959ea8..51ea2909b790 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -139,7 +139,7 @@ namespace svt // XEventListener - void SAL_CALL OCommonPicker::disposing( const EventObject& _rSource ) throw (RuntimeException) + void SAL_CALL OCommonPicker::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_Bool bDialogDying = _rSource.Source == m_xWindow; @@ -179,13 +179,13 @@ namespace svt } - Reference< XPropertySetInfo > SAL_CALL OCommonPicker::getPropertySetInfo( ) throw(RuntimeException) + Reference< XPropertySetInfo > SAL_CALL OCommonPicker::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } - void SAL_CALL OCommonPicker::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception) + void SAL_CALL OCommonPicker::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception) { OPropertyContainer::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); @@ -248,7 +248,7 @@ namespace svt // XControlAccess functions - void SAL_CALL OCommonPicker::setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const Any& aValue ) throw (IllegalArgumentException, RuntimeException) + void SAL_CALL OCommonPicker::setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const Any& aValue ) throw (IllegalArgumentException, RuntimeException, std::exception) { checkAlive(); @@ -261,7 +261,7 @@ namespace svt } - Any SAL_CALL OCommonPicker::getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException) + Any SAL_CALL OCommonPicker::getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException, std::exception) { checkAlive(); @@ -278,7 +278,7 @@ namespace svt // XControlInformation functions - Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControls( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControls( ) throw (RuntimeException, std::exception) { checkAlive(); @@ -293,7 +293,7 @@ namespace svt } - sal_Bool SAL_CALL OCommonPicker::isControlSupported( const OUString& aControlName ) throw (RuntimeException) + sal_Bool SAL_CALL OCommonPicker::isControlSupported( const OUString& aControlName ) throw (RuntimeException, std::exception) { checkAlive(); @@ -308,7 +308,7 @@ namespace svt } - Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControlProperties( const OUString& aControlName ) throw (IllegalArgumentException, RuntimeException) + Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControlProperties( const OUString& aControlName ) throw (IllegalArgumentException, RuntimeException, std::exception) { checkAlive(); @@ -323,7 +323,7 @@ namespace svt } - sal_Bool SAL_CALL OCommonPicker::isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException) + sal_Bool SAL_CALL OCommonPicker::isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException, std::exception) { checkAlive(); @@ -340,14 +340,14 @@ namespace svt // XExecutableDialog functions - void SAL_CALL OCommonPicker::setTitle( const OUString& _rTitle ) throw( RuntimeException ) + void SAL_CALL OCommonPicker::setTitle( const OUString& _rTitle ) throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; m_aTitle = _rTitle; } - sal_Int16 OCommonPicker::execute() throw (RuntimeException) + sal_Int16 OCommonPicker::execute() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -369,7 +369,7 @@ namespace svt // XCancellable functions - void SAL_CALL OCommonPicker::cancel( ) throw (RuntimeException) + void SAL_CALL OCommonPicker::cancel( ) throw (RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -416,7 +416,7 @@ namespace svt // XInitialization functions void SAL_CALL OCommonPicker::initialize( const Sequence< Any >& _rArguments ) - throw ( Exception, RuntimeException ) + throw ( Exception, RuntimeException, std::exception ) { checkAlive(); diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index 576f377c546b..16e5781bce7e 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -115,14 +115,14 @@ namespace svt // XEventListner - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // property set related methods // XPropertySet pure methods - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // OPropertySetHelper pure methods virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // OPropertyArrayUsageHelper pure methods @@ -130,38 +130,38 @@ namespace svt // OPropertySetHelper overridden methods virtual void SAL_CALL setFastPropertyValue_NoBroadcast( - sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception); + sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception, std::exception); // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XControlAccess functions - virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); // XControlInformation functions - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControls( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControls( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); // XCancellable functions - virtual void SAL_CALL cancel( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL cancel( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XInitialization functions - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ); // misc diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx index c4cd1db4c00c..f2a8a4beb267 100644 --- a/fpicker/source/office/fpinteraction.cxx +++ b/fpicker/source/office/fpinteraction.cxx @@ -54,7 +54,7 @@ namespace svt } - void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest ) throw (RuntimeException) + void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest ) throw (RuntimeException, std::exception) { if (!_rxRequest.is()) return; diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx index a74305c8e573..4f523176d001 100644 --- a/fpicker/source/office/fpinteraction.hxx +++ b/fpicker/source/office/fpinteraction.hxx @@ -70,7 +70,7 @@ namespace svt protected: // XInteractionHandler - virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _rxRequest ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _rxRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: ~OFilePickerInteractionHandler(); |