diff options
Diffstat (limited to 'fpicker/source/office')
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 60 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.hxx | 86 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFolderPicker.cxx | 23 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFolderPicker.hxx | 28 | ||||
-rw-r--r-- | fpicker/source/office/commonpicker.cxx | 25 | ||||
-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, 113 insertions, 139 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 0177748a01fa..1022932c1042 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -492,13 +492,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( SvtRemoteFilePicker, SvtFilePicker, OCommonPic // XExecutableDialog functions -void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception) +void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle ) { OCommonPicker::setTitle( _rTitle ); } -sal_Int16 SAL_CALL SvtFilePicker::execute( ) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL SvtFilePicker::execute( ) { return OCommonPicker::execute(); } @@ -507,15 +507,13 @@ sal_Int16 SAL_CALL SvtFilePicker::execute( ) throw (RuntimeException, std::exce // XAsynchronousExecutableDialog functions -void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception) +void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) { setTitle( _rTitle ); } void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) - throw (RuntimeException, - std::exception) { m_xDlgClosedListener = xListener; prepareDialog(); @@ -528,7 +526,7 @@ void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< css::ui::dialog // XFilePicker functions -void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( RuntimeException, std::exception ) +void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) { checkAlive(); @@ -536,7 +534,7 @@ void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( Runt m_bMultiSelection = bMode; } -void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName ) throw( RuntimeException, std::exception ) +void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName ) { checkAlive(); @@ -545,7 +543,6 @@ void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName ) throw( Runt } void SAL_CALL SvtFilePicker::setDisplayDirectory( const OUString& aDirectory ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { checkAlive(); @@ -553,7 +550,7 @@ void SAL_CALL SvtFilePicker::setDisplayDirectory( const OUString& aDirectory ) m_aDisplayDirectory = aDirectory; } -OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvtFilePicker::getDisplayDirectory() { checkAlive(); @@ -579,7 +576,7 @@ OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeException, return m_aDisplayDirectory; } -Sequence< OUString > SAL_CALL SvtFilePicker::getSelectedFiles() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvtFilePicker::getSelectedFiles() { checkAlive(); @@ -603,7 +600,7 @@ Sequence< OUString > SAL_CALL SvtFilePicker::getSelectedFiles() throw( RuntimeEx return aFiles; } -Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() { Sequence< OUString > aFiles = getSelectedFiles(); if (aFiles.getLength() > 1) @@ -618,7 +615,6 @@ Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException, void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID, sal_Int16 nControlAction, const Any& rValue ) - throw( RuntimeException, std::exception ) { checkAlive(); @@ -661,7 +657,6 @@ void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID, Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAction ) - throw( RuntimeException, std::exception ) { checkAlive(); @@ -696,7 +691,6 @@ Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAc void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValue ) - throw ( RuntimeException, std::exception ) { checkAlive(); @@ -736,7 +730,6 @@ void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValu OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID ) - throw ( RuntimeException, std::exception ) { checkAlive(); @@ -769,7 +762,6 @@ OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID ) void SAL_CALL SvtFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnable ) - throw( RuntimeException, std::exception ) { checkAlive(); @@ -811,7 +803,7 @@ void SAL_CALL SvtFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnab // XFilePickerNotifier functions -void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePickerListener >& xListener ) throw ( RuntimeException, std::exception ) +void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePickerListener >& xListener ) { checkAlive(); @@ -820,7 +812,7 @@ void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePicker } -void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePickerListener >& ) throw ( RuntimeException, std::exception ) +void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePickerListener >& ) { checkAlive(); @@ -833,7 +825,6 @@ void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePic Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats() - throw ( RuntimeException, std::exception ) { checkAlive(); @@ -846,7 +837,7 @@ Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats() } -sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() { checkAlive(); @@ -860,7 +851,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException } -sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() { checkAlive(); @@ -874,7 +865,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException, } -sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() { checkAlive(); @@ -889,7 +880,6 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException, void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage ) - throw ( IllegalArgumentException, RuntimeException, std::exception ) { checkAlive(); @@ -900,7 +890,6 @@ void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool ) - throw ( RuntimeException, std::exception ) { checkAlive(); @@ -928,7 +917,7 @@ sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool ) } -sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvtFilePicker::getShowState() { checkAlive(); @@ -947,7 +936,6 @@ sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException, std::e void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle, const Sequence< StringPair >& aFilters ) - throw ( IllegalArgumentException, RuntimeException, std::exception ) { checkAlive(); @@ -975,7 +963,6 @@ void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle, void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { checkAlive(); @@ -994,7 +981,6 @@ void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle, void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { checkAlive(); @@ -1010,7 +996,6 @@ void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle ) OUString SAL_CALL SvtFilePicker::getCurrentFilter() - throw( RuntimeException, std::exception ) { checkAlive(); @@ -1025,7 +1010,6 @@ OUString SAL_CALL SvtFilePicker::getCurrentFilter() void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments ) - throw ( Exception, RuntimeException, std::exception ) { checkAlive(); @@ -1108,19 +1092,19 @@ bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, co /* XServiceInfo */ -OUString SAL_CALL SvtFilePicker::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvtFilePicker::getImplementationName() { return impl_getStaticImplementationName(); } /* XServiceInfo */ -sal_Bool SAL_CALL SvtFilePicker::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvtFilePicker::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } /* XServiceInfo */ -Sequence< OUString > SAL_CALL SvtFilePicker::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvtFilePicker::getSupportedServiceNames() { return impl_getStaticSupportedServiceNames(); } @@ -1140,7 +1124,7 @@ OUString SvtFilePicker::impl_getStaticImplementationName() /* Helper for registry */ Reference< XInterface > SAL_CALL SvtFilePicker::impl_createInstance( - const Reference< XComponentContext >& ) throw( Exception ) + const Reference< XComponentContext >& ) { return Reference< XInterface >( *new SvtFilePicker ); } @@ -1172,19 +1156,19 @@ VclPtr<SvtFileDialog_Base> SvtRemoteFilePicker::implCreateDialog( vcl::Window* _ /* XServiceInfo */ -OUString SAL_CALL SvtRemoteFilePicker::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvtRemoteFilePicker::getImplementationName() { return impl_getStaticImplementationName(); } /* XServiceInfo */ -sal_Bool SAL_CALL SvtRemoteFilePicker::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvtRemoteFilePicker::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } /* XServiceInfo */ -Sequence< OUString > SAL_CALL SvtRemoteFilePicker::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvtRemoteFilePicker::getSupportedServiceNames() { return impl_getStaticSupportedServiceNames(); } @@ -1204,7 +1188,7 @@ OUString SvtRemoteFilePicker::impl_getStaticImplementationName() /* Helper for registry */ Reference< XInterface > SAL_CALL SvtRemoteFilePicker::impl_createInstance( - const Reference< XComponentContext >& ) throw( Exception ) + const Reference< XComponentContext >& ) { return Reference< XInterface >( *new SvtRemoteFilePicker ); } diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 0886b3ca1665..be50fc211e8f 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -98,97 +98,95 @@ public: // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& _rTitle ) override; + virtual sal_Int16 SAL_CALL execute( ) override; // XAsynchronousExecutableDialog functions - virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) override; + virtual void SAL_CALL startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) override; // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setDefaultName( const OUString& aName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getDisplayDirectory() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getFiles() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) override; + virtual void SAL_CALL setDefaultName( const OUString& aName ) override; + virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override; + virtual OUString SAL_CALL getDisplayDirectory() override; + virtual css::uno::Sequence< OUString > SAL_CALL getFiles() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() override; // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const css::uno::Any& value ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setLabel( sal_Int16 ElementID, const OUString& aValue ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getLabel( sal_Int16 ElementID ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL enableControl( sal_Int16 ElementID, sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const css::uno::Any& value ) override; + virtual css::uno::Any SAL_CALL getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) override; + virtual void SAL_CALL setLabel( sal_Int16 ElementID, const OUString& aValue ) override; + virtual OUString SAL_CALL getLabel( sal_Int16 ElementID ) override; + virtual void SAL_CALL enableControl( sal_Int16 ElementID, sal_Bool bEnable ) override; // XFilePickerNotifier functions - virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override; + virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override; // XFilePreview functions - virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int32 SAL_CALL getTargetColorDepth() throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int32 SAL_CALL getAvailableWidth() throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int32 SAL_CALL getAvailableHeight() throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL getShowState() throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() override; + virtual sal_Int32 SAL_CALL getTargetColorDepth() override; + virtual sal_Int32 SAL_CALL getAvailableWidth() override; + virtual sal_Int32 SAL_CALL getAvailableHeight() override; + virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) override; + virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) override; + virtual sal_Bool SAL_CALL getShowState() override; // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getCurrentFilter() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) override; + virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) override; + virtual OUString SAL_CALL getCurrentFilter() override; // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) override; // these methods are here because they're ambiguous - virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL cancel() override { ::svt::OCommonPicker::cancel(); } - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL dispose() override { ::svt::OCommonPicker::dispose(); } - virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& l) throw( css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& l) override { ::svt::OCommonPicker::addEventListener(l); } - virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& l) throw( css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& l) override { ::svt::OCommonPicker::removeEventListener(l); } // XInitialization functions - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo functions /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; /* Helper for XServiceInfo */ static css::uno::Sequence< OUString > @@ -198,8 +196,7 @@ public: /* Helper for registry */ /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( - const css::uno::Reference< css::uno::XComponentContext >& rxContext ) - throw( css::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); protected: @@ -244,10 +241,10 @@ public: DECLARE_XTYPEPROVIDER( ) /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; /* Helper for XServiceInfo */ static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); @@ -256,8 +253,7 @@ public: /* Helper for registry */ /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( - const css::uno::Reference< css::uno::XComponentContext >& rxContext ) - throw( css::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); }; #endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index ec1f8a8e0f35..dd0b34c36b4c 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -43,22 +43,22 @@ SvtFolderPicker::~SvtFolderPicker() { } -void SAL_CALL SvtFolderPicker::setTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception) +void SAL_CALL SvtFolderPicker::setTitle( const OUString& _rTitle ) { OCommonPicker::setTitle( _rTitle ); } -sal_Int16 SAL_CALL SvtFolderPicker::execute( ) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL SvtFolderPicker::execute( ) { return OCommonPicker::execute(); } -void SAL_CALL SvtFolderPicker::setDialogTitle( const OUString& _rTitle) throw (RuntimeException, std::exception) +void SAL_CALL SvtFolderPicker::setDialogTitle( const OUString& _rTitle) { setTitle( _rTitle ); } -void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) { m_xListener = xListener; prepareDialog(); @@ -108,12 +108,11 @@ IMPL_LINK( SvtFolderPicker, DialogClosedHdl, Dialog&, rDlg, void ) } void SAL_CALL SvtFolderPicker::setDisplayDirectory( const OUString& aDirectory ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { m_aDisplayDirectory = aDirectory; } -OUString SAL_CALL SvtFolderPicker::getDisplayDirectory() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvtFolderPicker::getDisplayDirectory() { if ( ! getDialog() ) return m_aDisplayDirectory; @@ -126,7 +125,7 @@ OUString SAL_CALL SvtFolderPicker::getDisplayDirectory() throw( RuntimeException return OUString(); } -OUString SAL_CALL SvtFolderPicker::getDirectory() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvtFolderPicker::getDirectory() { if ( ! getDialog() ) return m_aDisplayDirectory; @@ -140,30 +139,29 @@ OUString SAL_CALL SvtFolderPicker::getDirectory() throw( RuntimeException, std:: } void SAL_CALL SvtFolderPicker::setDescription( const OUString& aDescription ) - throw( RuntimeException, std::exception ) { m_aDescription = aDescription; } -void SvtFolderPicker::cancel() throw (RuntimeException, std::exception) +void SvtFolderPicker::cancel() { OCommonPicker::cancel(); } /* XServiceInfo */ -OUString SAL_CALL SvtFolderPicker::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvtFolderPicker::getImplementationName() { return impl_getStaticImplementationName(); } /* XServiceInfo */ -sal_Bool SAL_CALL SvtFolderPicker::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvtFolderPicker::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } /* XServiceInfo */ -Sequence< OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames() { return impl_getStaticSupportedServiceNames(); } @@ -183,7 +181,6 @@ OUString SvtFolderPicker::impl_getStaticImplementationName() /* Helper for registry */ Reference< XInterface > SAL_CALL SvtFolderPicker::impl_createInstance( const Reference< XComponentContext >& ) - throw( Exception ) { return Reference< XInterface >( *new SvtFolderPicker ); } diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx index 771bdf8b2790..3883bd6c46ba 100644 --- a/fpicker/source/office/OfficeFolderPicker.hxx +++ b/fpicker/source/office/OfficeFolderPicker.hxx @@ -56,35 +56,34 @@ public: // XFolderPicker2 functions - virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getDisplayDirectory() throw( css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getDirectory() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setDescription( const OUString& aDescription ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override; + virtual OUString SAL_CALL getDisplayDirectory() override; + virtual OUString SAL_CALL getDirectory() override; + virtual void SAL_CALL setDescription( const OUString& aDescription ) override; - virtual void SAL_CALL cancel() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() override; // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& _rTitle ) override; + virtual sal_Int16 SAL_CALL execute( ) override; // XAsynchronousExecutableDialog functions - virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) override; + virtual void SAL_CALL startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) override; // XServiceInfo functions /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; /* Helper for XServiceInfo */ static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); @@ -93,8 +92,7 @@ public: /* Helper for registry */ /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( - const css::uno::Reference< css::uno::XComponentContext >& rxContext ) - throw( css::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); protected: diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index f498a79c0d0a..1150ed51864e 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -137,7 +137,7 @@ namespace svt // XEventListener - void SAL_CALL OCommonPicker::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL OCommonPicker::disposing( const EventObject& _rSource ) { SolarMutexGuard aGuard; bool bDialogDying = _rSource.Source == m_xWindow; @@ -178,13 +178,13 @@ namespace svt } - Reference< XPropertySetInfo > SAL_CALL OCommonPicker::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > SAL_CALL OCommonPicker::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } - void SAL_CALL OCommonPicker::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception) + void SAL_CALL OCommonPicker::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { OPropertyContainer::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); @@ -244,7 +244,7 @@ namespace svt // XControlAccess functions - void SAL_CALL OCommonPicker::setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const Any& aValue ) throw (IllegalArgumentException, RuntimeException, std::exception) + void SAL_CALL OCommonPicker::setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const Any& aValue ) { checkAlive(); @@ -257,7 +257,7 @@ namespace svt } - Any SAL_CALL OCommonPicker::getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException, std::exception) + Any SAL_CALL OCommonPicker::getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) { checkAlive(); @@ -274,7 +274,7 @@ namespace svt // XControlInformation functions - Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControls( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControls( ) { checkAlive(); @@ -289,7 +289,7 @@ namespace svt } - sal_Bool SAL_CALL OCommonPicker::isControlSupported( const OUString& aControlName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OCommonPicker::isControlSupported( const OUString& aControlName ) { checkAlive(); @@ -303,7 +303,7 @@ namespace svt } - Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControlProperties( const OUString& aControlName ) throw (IllegalArgumentException, RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControlProperties( const OUString& aControlName ) { checkAlive(); @@ -318,7 +318,7 @@ namespace svt } - sal_Bool SAL_CALL OCommonPicker::isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException, std::exception) + sal_Bool SAL_CALL OCommonPicker::isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) { checkAlive(); @@ -335,14 +335,14 @@ namespace svt // XExecutableDialog functions - void SAL_CALL OCommonPicker::setTitle( const OUString& _rTitle ) throw( RuntimeException, std::exception ) + void SAL_CALL OCommonPicker::setTitle( const OUString& _rTitle ) { SolarMutexGuard aGuard; m_aTitle = _rTitle; } - sal_Int16 OCommonPicker::execute() throw (RuntimeException, std::exception) + sal_Int16 OCommonPicker::execute() { SolarMutexGuard aGuard; @@ -364,7 +364,7 @@ namespace svt // XCancellable functions - void SAL_CALL OCommonPicker::cancel( ) throw (RuntimeException, std::exception) + void SAL_CALL OCommonPicker::cancel( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -409,7 +409,6 @@ namespace svt // XInitialization functions void SAL_CALL OCommonPicker::initialize( const Sequence< Any >& _rArguments ) - throw ( Exception, RuntimeException, std::exception ) { checkAlive(); diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index 36bc38be5463..5212080433ef 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -114,14 +114,14 @@ namespace svt // XEventListner - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // property set related methods // XPropertySet pure methods - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // OPropertySetHelper pure methods virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper pure methods @@ -129,40 +129,40 @@ namespace svt // OPropertySetHelper overridden methods virtual void SAL_CALL setFastPropertyValue_NoBroadcast( - sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw (css::uno::Exception, std::exception) override; + sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; // XExecutableDialog functions /// @throws css::uno::RuntimeException - virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setTitle( const OUString& _rTitle ); /// @throws css::uno::RuntimeException - virtual sal_Int16 SAL_CALL execute() throw( css::uno::RuntimeException, std::exception ); + virtual sal_Int16 SAL_CALL execute(); // XControlAccess functions - virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const css::uno::Any& aValue ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) override; // XControlInformation functions - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControls( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControls( ) override; + virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) override; + virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) override; // XCancellable functions - virtual void SAL_CALL cancel( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) override; // XInitialization functions - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // misc diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx index 0ed85f4f9904..8da72d68d805 100644 --- a/fpicker/source/office/fpinteraction.cxx +++ b/fpicker/source/office/fpinteraction.cxx @@ -47,7 +47,7 @@ namespace svt } - void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest ) throw (RuntimeException, std::exception) + void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest ) { if (!_rxRequest.is()) return; diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx index 26d82bc61151..f4ad88fb8122 100644 --- a/fpicker/source/office/fpinteraction.hxx +++ b/fpicker/source/office/fpinteraction.hxx @@ -69,7 +69,7 @@ namespace svt protected: // XInteractionHandler - virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) override; private: virtual ~OFilePickerInteractionHandler() override; |