diff options
Diffstat (limited to 'chart2')
215 files changed, 2104 insertions, 2104 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 8e965ba203af..35a43e3738db 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -234,7 +234,7 @@ public: // ::com::sun::star::lang::XInitialization 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); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XModel (required interface) @@ -242,242 +242,242 @@ public: attachResource( const OUString& rURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL - getURL() throw (::com::sun::star::uno::RuntimeException); + getURL() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getArgs() throw (::com::sun::star::uno::RuntimeException); + getArgs() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - lockControllers() throw (::com::sun::star::uno::RuntimeException); + lockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - unlockControllers() throw (::com::sun::star::uno::RuntimeException); + unlockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasControllersLocked() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL getCurrentController() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::container::NoSuchElementException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XComponent (base of XModel) virtual void SAL_CALL - dispose() throw (::com::sun::star::uno::RuntimeException); + dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XCloseable virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw(::com::sun::star::util::CloseVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XCloseBroadcaster (base of XCloseable) virtual void SAL_CALL addCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XStorable2 (extension of XStorable) virtual void SAL_CALL storeSelf( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XStorable (required interface) virtual sal_Bool SAL_CALL - hasLocation() throw (::com::sun::star::uno::RuntimeException); + hasLocation() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL - getLocation() throw (::com::sun::star::uno::RuntimeException); + getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL - isReadonly() throw (::com::sun::star::uno::RuntimeException); + isReadonly() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL store() throw (::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL storeAsURL( const OUString& rURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL storeToURL( const OUString& rURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XModifiable (required interface) virtual sal_Bool SAL_CALL - isModified() throw (::com::sun::star::uno::RuntimeException); + isModified() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setModified( sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XModifyBroadcaster (base of XModifiable) virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ datatransferable::XTransferable ____ virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // lang::XTypeProvider (overloaded method of WeakImplHelper) virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL - getTypes() throw (::com::sun::star::uno::RuntimeException); + getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ document::XDocumentPropertiesSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL - getDocumentProperties( ) throw (::com::sun::star::uno::RuntimeException); + getDocumentProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ document::XUndoManagerSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > SAL_CALL - getUndoManager( ) throw (::com::sun::star::uno::RuntimeException); + getUndoManager( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::chart2::XChartDocument virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL - getFirstDiagram() throw (::com::sun::star::uno::RuntimeException); + getFirstDiagram() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setFirstDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL createInternalDataProvider( sal_Bool bCloneExistingData ) throw (::com::sun::star::util::CloseVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL hasInternalDataProvider() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > SAL_CALL getDataProvider() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setChartTypeManager( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager >& xNewManager ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager > SAL_CALL getChartTypeManager() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getPageBackground() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataReceiver (public API) ____ virtual void SAL_CALL attachDataProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider >& xProvider ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL getUsedData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL attachNumberFormatsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& Title ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XInterface (for old API wrapper) ____ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XLoadable ____ virtual void SAL_CALL initNew() throw (::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL load( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XVisualObject ____ virtual void SAL_CALL setVisualAreaSize( @@ -486,34 +486,34 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XMultiServiceFactory ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier , const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); + getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XStorageBasedDocument ____ virtual void SAL_CALL loadFromStorage( @@ -523,59 +523,59 @@ public: ::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL switchToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentStorage() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addStorageChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeStorageChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // for SvNumberFormatsSupplierObj // ____ XUnoTunnel ___ virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XNumberFormatsSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChild ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSource ____ allows access to the curently used data and data ranges virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XDumper virtual OUString SAL_CALL dump() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // normal methods ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 702bebf1699a..a12d9bbb8027 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -118,7 +118,7 @@ public: // ___lang::XInitialization___ 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); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // ___ExplicitValueProvider___ virtual sal_Bool getExplicitValuesForAxis( @@ -138,56 +138,56 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException , ::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XEventListener (base of XCloseListener and XModifyListener) virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XModifyListener virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // ::com::sun::star::util::XModeChangeBroadcaster - virtual void SAL_CALL addModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XUpdatable virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::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); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XMultiServiceFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // for ExplicitValueProvider // ____ XUnoTunnel ___ virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XDumper virtual OUString SAL_CALL dump() diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index c73221285e95..a2b1a694fe75 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -506,14 +506,14 @@ void SAL_CALL AccessibleBase::disposing() // ________ XAccessible ________ Reference< XAccessibleContext > SAL_CALL AccessibleBase::getAccessibleContext() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return this; } // ________ AccessibleBase::XAccessibleContext ________ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( GetMutex() ); if( ! m_bMayHaveChildren || @@ -539,7 +539,7 @@ sal_Int32 AccessibleBase::ImplGetAccessibleChildCount() const } Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, RuntimeException) + throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { CheckDisposeState(); Reference< XAccessible > xResult; @@ -583,7 +583,7 @@ Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i } Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); Reference< XAccessible > aResult; @@ -594,7 +594,7 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent() } sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); @@ -604,20 +604,20 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent() } sal_Int16 SAL_CALL AccessibleBase::getAccessibleRole() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return AccessibleRole::SHAPE; } Reference< XAccessibleRelationSet > SAL_CALL AccessibleBase::getAccessibleRelationSet() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Reference< XAccessibleRelationSet > aResult; return aResult; } Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet() - throw (RuntimeException) + throw (RuntimeException, std::exception) { if( ! m_bStateSetInitialized ) { @@ -638,7 +638,7 @@ Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet( } lang::Locale SAL_CALL AccessibleBase::getLocale() - throw (IllegalAccessibleComponentStateException, RuntimeException) + throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { CheckDisposeState(); @@ -647,7 +647,7 @@ lang::Locale SAL_CALL AccessibleBase::getLocale() // ________ AccessibleBase::XAccessibleComponent ________ sal_Bool SAL_CALL AccessibleBase::containsPoint( const awt::Point& aPoint ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { awt::Rectangle aRect( getBounds() ); @@ -662,7 +662,7 @@ sal_Bool SAL_CALL AccessibleBase::containsPoint( const awt::Point& aPoint ) } Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); Reference< XAccessible > aResult; @@ -702,7 +702,7 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const aw } awt::Rectangle SAL_CALL AccessibleBase::getBounds() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ExplicitValueProvider *pExplicitValueProvider( ExplicitValueProvider::getExplicitValueProvider( m_aAccInfo.m_xView )); @@ -738,7 +738,7 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds() } awt::Point SAL_CALL AccessibleBase::getLocation() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); awt::Rectangle aBBox( getBounds() ); @@ -746,7 +746,7 @@ awt::Point SAL_CALL AccessibleBase::getLocation() } awt::Point SAL_CALL AccessibleBase::getLocationOnScreen() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); @@ -767,7 +767,7 @@ awt::Point SAL_CALL AccessibleBase::getLocationOnScreen() } awt::Size SAL_CALL AccessibleBase::getSize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); awt::Rectangle aBBox( getBounds() ); @@ -775,7 +775,7 @@ awt::Size SAL_CALL AccessibleBase::getSize() } void SAL_CALL AccessibleBase::grabFocus() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); @@ -787,13 +787,13 @@ void SAL_CALL AccessibleBase::grabFocus() } sal_Int32 SAL_CALL AccessibleBase::getForeground() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getColor( ACC_BASE_FOREGROUND ); } sal_Int32 SAL_CALL AccessibleBase::getBackground() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getColor( ACC_BASE_BACKGROUND ); } @@ -892,19 +892,19 @@ sal_Int32 AccessibleBase::getColor( eColorType eColType ) // ________ AccessibleBase::XServiceInfo ________ OUString SAL_CALL AccessibleBase::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString( "AccessibleBase" ); } sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( 2 ); OUString* pStr = aSeq.getArray(); @@ -916,13 +916,13 @@ uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames() // ________ AccessibleBase::XEventListener ________ void SAL_CALL AccessibleBase::disposing( const lang::EventObject& /*Source*/ ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { } // ________ XAccessibleEventBroadcasters ________ void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -936,7 +936,7 @@ void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAcce } void SAL_CALL AccessibleBase::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index f480aa2fae98..82b08e6075a9 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -149,14 +149,14 @@ sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const // ________ XServiceInfo ________ OUString SAL_CALL AccessibleChartElement::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString( "AccessibleChartElement" ); } // ________ AccessibleChartElement::XAccessibleContext (overloaded) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return ObjectNameProvider::getNameForCID( GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument ); @@ -164,14 +164,14 @@ OUString SAL_CALL AccessibleChartElement::getAccessibleName() // ________ AccessibleChartElement::XAccessibleContext (overloaded) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return getToolTipText(); } // ________ AccessibleChartElement::XAccessibleExtendedComponent ________ Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { CheckDisposeState(); @@ -194,13 +194,13 @@ Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont() } OUString SAL_CALL AccessibleChartElement::getTitledBorderText() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString(); } OUString SAL_CALL AccessibleChartElement::getToolTipText() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { CheckDisposeState(); @@ -210,55 +210,55 @@ OUString SAL_CALL AccessibleChartElement::getToolTipText() // ________ XAccessibleComponent ________ sal_Bool SAL_CALL AccessibleChartElement::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::containsPoint( aPoint ); } Reference< XAccessible > SAL_CALL AccessibleChartElement::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getAccessibleAtPoint( aPoint ); } awt::Rectangle SAL_CALL AccessibleChartElement::getBounds() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getBounds(); } awt::Point SAL_CALL AccessibleChartElement::getLocation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getLocation(); } awt::Point SAL_CALL AccessibleChartElement::getLocationOnScreen() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getLocationOnScreen(); } awt::Size SAL_CALL AccessibleChartElement::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getSize(); } void SAL_CALL AccessibleChartElement::grabFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::grabFocus(); } sal_Int32 SAL_CALL AccessibleChartElement::getForeground() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getForeground(); } sal_Int32 SAL_CALL AccessibleChartElement::getBackground() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getBackground(); } diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index d699ef7925c3..d8a824ed9965 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -86,36 +86,36 @@ public: // ________ XAccessibleContext ________ virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleExtendedComponent ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getTitledBorderText() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getToolTipText() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // the following interface is implemented in AccessibleBase, however it is // also a (non-virtual) base class of XAccessibleExtendedComponent Thus // these methods have to be overloaded and forward to AccessibleBase // ________ XAccessibleComponent ________ - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: bool m_bHasText; diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index 07e5714fe145..94e9120fe37d 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -84,14 +84,14 @@ AccessibleChartShape::~AccessibleChartShape() // ________ XServiceInfo ________ OUString AccessibleChartShape::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString( "AccessibleChartShape" ); } // ________ XAccessibleContext ________ sal_Int32 AccessibleChartShape::getAccessibleChildCount() - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int32 nCount(0); if ( m_pAccShape ) @@ -102,7 +102,7 @@ sal_Int32 AccessibleChartShape::getAccessibleChildCount() } Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, RuntimeException) + throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { Reference< XAccessible > xChild; if ( m_pAccShape ) @@ -113,7 +113,7 @@ Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i ) } sal_Int16 AccessibleChartShape::getAccessibleRole() - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int16 nRole(0); if ( m_pAccShape ) @@ -124,7 +124,7 @@ sal_Int16 AccessibleChartShape::getAccessibleRole() } OUString AccessibleChartShape::getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { OUString aDescription; if ( m_pAccShape ) @@ -135,7 +135,7 @@ OUString AccessibleChartShape::getAccessibleDescription() } OUString AccessibleChartShape::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { OUString aName; if ( m_pAccShape ) @@ -147,7 +147,7 @@ OUString AccessibleChartShape::getAccessibleName() // ________ XAccessibleComponent ________ sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bReturn = sal_False; if ( m_pAccShape ) @@ -158,7 +158,7 @@ sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint ) } Reference< XAccessible > AccessibleChartShape::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< XAccessible > xResult; if ( m_pAccShape ) @@ -169,7 +169,7 @@ Reference< XAccessible > AccessibleChartShape::getAccessibleAtPoint( const awt:: } awt::Rectangle AccessibleChartShape::getBounds() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Rectangle aBounds; if ( m_pAccShape ) @@ -180,7 +180,7 @@ awt::Rectangle AccessibleChartShape::getBounds() } awt::Point AccessibleChartShape::getLocation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Point aLocation; if ( m_pAccShape ) @@ -191,7 +191,7 @@ awt::Point AccessibleChartShape::getLocation() } awt::Point AccessibleChartShape::getLocationOnScreen() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Point aLocation; if ( m_pAccShape ) @@ -202,7 +202,7 @@ awt::Point AccessibleChartShape::getLocationOnScreen() } awt::Size AccessibleChartShape::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Size aSize; if ( m_pAccShape ) @@ -213,13 +213,13 @@ awt::Size AccessibleChartShape::getSize() } void AccessibleChartShape::grabFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::grabFocus(); } sal_Int32 AccessibleChartShape::getForeground() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Int32 nColor(0); if ( m_pAccShape ) @@ -230,7 +230,7 @@ sal_Int32 AccessibleChartShape::getForeground() } sal_Int32 AccessibleChartShape::getBackground() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Int32 nColor(0); if ( m_pAccShape ) @@ -242,7 +242,7 @@ sal_Int32 AccessibleChartShape::getBackground() // ________ XAccessibleExtendedComponent ________ Reference< awt::XFont > AccessibleChartShape::getFont() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< awt::XFont > xFont; if ( m_pAccShape ) @@ -253,7 +253,7 @@ Reference< awt::XFont > AccessibleChartShape::getFont() } OUString AccessibleChartShape::getTitledBorderText() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OUString aText; if ( m_pAccShape ) @@ -264,7 +264,7 @@ OUString AccessibleChartShape::getTitledBorderText() } OUString AccessibleChartShape::getToolTipText() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { OUString aText; if ( m_pAccShape ) diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index eb972ee15204..bd3e2d32e96d 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -50,40 +50,40 @@ public: // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleContext ________ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleComponent ________ - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleExtendedComponent ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getTitledBorderText() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getToolTipText() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::accessibility::AccessibleShape* m_pAccShape; diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 8125ab90521e..62e23c6fe63a 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -104,39 +104,39 @@ awt::Point AccessibleChartView::GetUpperLeftOnScreen() const // ________ XAccessibleContext ________ OUString SAL_CALL AccessibleChartView::getAccessibleName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return SCH_RESSTR(STR_OBJECT_DIAGRAM); } OUString SAL_CALL AccessibleChartView::getAccessibleDescription() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return getAccessibleName(); } Reference< XAccessible > SAL_CALL AccessibleChartView::getAccessibleParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Reference< XAccessible >( m_xParent ); } sal_Int32 SAL_CALL AccessibleChartView::getAccessibleIndexInParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // the document is always the only child of the window return 0; } sal_Int16 SAL_CALL AccessibleChartView::getAccessibleRole() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleRole::DOCUMENT; } // ________ XAccessibleComponent ________ awt::Rectangle SAL_CALL AccessibleChartView::getBounds() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Rectangle aResult( GetWindowPosSize()); Reference< XAccessible > xParent( m_xParent ); @@ -154,7 +154,7 @@ awt::Rectangle SAL_CALL AccessibleChartView::getBounds() } awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Rectangle aBounds( getBounds()); awt::Point aResult; @@ -173,7 +173,7 @@ awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen() // lang::XInitialization void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { //0: view::XSelectionSupplier offers notifications for selection changes and access to the selection itself //1: frame::XModel representing the chart model - offers access to object data @@ -348,7 +348,7 @@ ExplicitValueProvider* AccessibleChartView::getExplicitValueProvider() // view::XSelectionChangeListener void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /*rEvent*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< view::XSelectionSupplier > xSelectionSupplier; { @@ -379,7 +379,7 @@ void SAL_CALL AccessibleChartView::disposing() // XEventListener void SAL_CALL AccessibleChartView::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index e9c71af0709f..6fcf15d9dacc 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -55,7 +55,7 @@ AccessibleTextHelper::~AccessibleTextHelper() // ____ XInitialization ____ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArguments ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OUString aCID; Reference< XAccessible > xEventSource; @@ -101,7 +101,7 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg // ____ XAccessibleContext ____ ::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleChildCount() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_pTextHelper ) { @@ -113,7 +113,7 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sal_Int32 i ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( m_pTextHelper ) { @@ -124,49 +124,49 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sa } Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return Reference< XAccessible >(); } ::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleIndexInParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return -1; } ::sal_Int16 SAL_CALL AccessibleTextHelper::getAccessibleRole() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return AccessibleRole::UNKNOWN; } OUString SAL_CALL AccessibleTextHelper::getAccessibleDescription() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return OUString(); } OUString SAL_CALL AccessibleTextHelper::getAccessibleName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return OUString(); } Reference< XAccessibleRelationSet > SAL_CALL AccessibleTextHelper::getAccessibleRelationSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return Reference< XAccessibleRelationSet >(); } Reference< XAccessibleStateSet > SAL_CALL AccessibleTextHelper::getAccessibleStateSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return Reference< XAccessibleStateSet >(); @@ -174,7 +174,7 @@ Reference< XAccessibleStateSet > SAL_CALL AccessibleTextHelper::getAccessibleSta lang::Locale SAL_CALL AccessibleTextHelper::getLocale() throw (IllegalAccessibleComponentStateException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return lang::Locale(); diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 394d34825367..5efb1f06d74c 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -87,40 +87,40 @@ AreaWrapper::~AreaWrapper() // ____ XShape ____ awt::Point SAL_CALL AreaWrapper::getPosition() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return awt::Point(0,0); } void SAL_CALL AreaWrapper::setPosition( const awt::Point& /*aPosition*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set position of chart area" ); } awt::Size SAL_CALL AreaWrapper::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetPageSize(); } void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ ) throw (beans::PropertyVetoException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set size of chart area" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL AreaWrapper::getShapeType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartArea" ); } // ____ XComponent ____ void SAL_CALL AreaWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -131,14 +131,14 @@ void SAL_CALL AreaWrapper::dispose() void SAL_CALL AreaWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL AreaWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index 2e9d841c638d..f453b9d7a780 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -56,28 +56,28 @@ public: // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index fd44cce3b3e2..3c07f886339d 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -405,7 +405,7 @@ AxisWrapper::~AxisWrapper() } // ____ chart::XAxis ____ -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno::RuntimeException) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno::RuntimeException, std::exception) { if( !m_xAxisTitle.is() ) { @@ -434,7 +434,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno } return m_xAxisTitle; } -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno::RuntimeException) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno::RuntimeException, std::exception) { if( !m_xMajorGrid.is() ) { @@ -457,7 +457,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno } return m_xMajorGrid; } -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno::RuntimeException) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno::RuntimeException, std::exception) { if( !m_xMinorGrid.is() ) { @@ -483,20 +483,20 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno // ____ XShape ____ awt::Point SAL_CALL AxisWrapper::getPosition() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Point aResult( m_spChart2ModelContact->GetAxisPosition( this->getAxis() ) ); return aResult; } void SAL_CALL AxisWrapper::setPosition( const awt::Point& /*aPosition*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set position of Axis" ); } awt::Size SAL_CALL AxisWrapper::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Size aSize( m_spChart2ModelContact->GetAxisSize( this->getAxis() ) ); return aSize; @@ -504,21 +504,21 @@ awt::Size SAL_CALL AxisWrapper::getSize() void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ ) throw (beans::PropertyVetoException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set size of Axis" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL AxisWrapper::getShapeType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("com.sun.star.chart.ChartAxis"); } // ____ XNumberFormatsSupplier ____ uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSettings() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY ); if( xNumSuppl.is() ) @@ -528,7 +528,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSetti } uno::Reference< util::XNumberFormats > SAL_CALL AxisWrapper::getNumberFormats() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY ); if( xNumSuppl.is() ) @@ -556,7 +556,7 @@ void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDim // ____ XComponent ____ void SAL_CALL AxisWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -570,14 +570,14 @@ void SAL_CALL AxisWrapper::dispose() void SAL_CALL AxisWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL AxisWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index b7424ad278c3..989c0b8078a8 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -77,41 +77,41 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ chart::XAxis ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getAxisTitle( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMajorGrid( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinorGrid( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getAxisTitle( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMajorGrid( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinorGrid( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XNumberFormatsSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 35afa7c20d37..c3f39cee5b89 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -416,7 +416,7 @@ ChartDataWrapper::~ChartDataWrapper() // ____ XChartDataArray (read)____ Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -424,7 +424,7 @@ Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData() return Sequence< Sequence< double > >(); } Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -432,7 +432,7 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions() return Sequence< OUString >(); } Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -441,14 +441,14 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions() } // ____ XComplexDescriptionAccess (read) ____ -Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) return m_xDataAccess->getComplexRowDescriptions(); return Sequence< Sequence< OUString > >(); } -Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -457,14 +457,14 @@ Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDesc } // ____ XAnyDescriptionAccess (read) ____ -Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) return m_xDataAccess->getAnyRowDescriptions(); return Sequence< Sequence< uno::Any > >(); } -Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -473,7 +473,7 @@ Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescript } // ____ XDateCategories (read) ____ -Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::RuntimeException) +Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::RuntimeException, std::exception) { initDataAccess(); Reference< XDateCategories > xDateCategories( m_xDataAccess, uno::UNO_QUERY ); @@ -484,50 +484,50 @@ Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::Ru // ____ XChartDataArray (write)____ void SAL_CALL ChartDataWrapper::setData( const Sequence< Sequence< double > >& rData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { lcl_DataOperator aOperator( rData ); applyData( aOperator ); } void SAL_CALL ChartDataWrapper::setRowDescriptions( const Sequence< OUString >& rRowDescriptions ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { lcl_RowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } void SAL_CALL ChartDataWrapper::setColumnDescriptions( const Sequence< OUString >& rColumnDescriptions ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { lcl_ColumnDescriptionsOperator aOperator( rColumnDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } // ____ XComplexDescriptionAccess (write) ____ -void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& rRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& rRowDescriptions ) throw (uno::RuntimeException, std::exception) { lcl_ComplexRowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } -void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception) { lcl_ComplexColumnDescriptionsOperator aOperator( rColumnDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } // ____ XAnyDescriptionAccess (write) ____ -void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions ) throw (uno::RuntimeException, std::exception) { lcl_AnyRowDescriptionsOperator aOperator( rRowDescriptions ); applyData( aOperator ); } -void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception) { lcl_AnyColumnDescriptionsOperator aOperator( rColumnDescriptions ); applyData( aOperator ); } // ____ XDateCategories (write) ____ -void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException) +void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); ControllerLockGuardUNO aCtrlLockGuard( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY )); @@ -540,7 +540,7 @@ void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDa void SAL_CALL ChartDataWrapper::addChartDataChangeEventListener( const uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( aListener ); } @@ -548,19 +548,19 @@ void SAL_CALL ChartDataWrapper::addChartDataChangeEventListener( void SAL_CALL ChartDataWrapper::removeChartDataChangeEventListener( const uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } double SAL_CALL ChartDataWrapper::getNotANumber() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return DBL_MIN; } sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return DBL_MIN == nNumber || ::rtl::math::isNan( nNumber ) @@ -569,7 +569,7 @@ sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber ) // ____ XComponent ____ void SAL_CALL ChartDataWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this ))); m_xDataAccess=0; @@ -577,21 +577,21 @@ void SAL_CALL ChartDataWrapper::dispose() void SAL_CALL ChartDataWrapper::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL ChartDataWrapper::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } // ____ XEventListener ____ void SAL_CALL ChartDataWrapper::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 263c3df4799b..370df448889f 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -59,84 +59,84 @@ public: protected: // ____ XDateCategories ____ - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAnyDescriptionAccess ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setAnyRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setAnyColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartData (base of XChartDataArray) ____ virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual double SAL_CALL getNotANumber() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); void fireChartDataChangeEvent( ::com::sun::star::chart::ChartDataChangeEvent& aEvent ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 3d6f4c4dbfba..b6242a4a1070 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -710,7 +710,7 @@ ChartDocumentWrapper::~ChartDocumentWrapper() // ____ XInterface (for new interfaces) ____ uno::Any SAL_CALL ChartDocumentWrapper::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_xDelegator.is()) // calls queryAggregation if the delegator doesn't know aType @@ -721,7 +721,7 @@ uno::Any SAL_CALL ChartDocumentWrapper::queryInterface( const uno::Type& aType ) // ____ chart::XChartDocument (old API wrapper) ____ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xTitle.is() ) { @@ -732,7 +732,7 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle() } Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xSubTitle.is() ) { @@ -743,7 +743,7 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle() } Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xLegend.is()) { @@ -755,7 +755,7 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend() } Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xArea.is()) { @@ -767,7 +767,7 @@ Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea() } Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xDiagram.is() ) { @@ -785,7 +785,7 @@ Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram() } void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDiagram ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< util::XRefreshable > xAddIn( xDiagram, uno::UNO_QUERY ); if( xAddIn.is() ) @@ -818,7 +818,7 @@ void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDi } Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xChartData.is() ) { @@ -830,7 +830,7 @@ Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData() } void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& xNewData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !xNewData.is() ) return; @@ -845,7 +845,7 @@ void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& x sal_Bool SAL_CALL ChartDocumentWrapper::attachResource( const OUString& URL, const Sequence< beans::PropertyValue >& Arguments ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -854,7 +854,7 @@ sal_Bool SAL_CALL ChartDocumentWrapper::attachResource( } OUString SAL_CALL ChartDocumentWrapper::getURL() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -863,7 +863,7 @@ OUString SAL_CALL ChartDocumentWrapper::getURL() } Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -872,7 +872,7 @@ Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs() } void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::XController >& Controller ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -881,7 +881,7 @@ void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::X void SAL_CALL ChartDocumentWrapper::disconnectController( const Reference< frame::XController >& Controller ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -889,7 +889,7 @@ void SAL_CALL ChartDocumentWrapper::disconnectController( } void SAL_CALL ChartDocumentWrapper::lockControllers() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -897,7 +897,7 @@ void SAL_CALL ChartDocumentWrapper::lockControllers() } void SAL_CALL ChartDocumentWrapper::unlockControllers() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -905,7 +905,7 @@ void SAL_CALL ChartDocumentWrapper::unlockControllers() } sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -914,7 +914,7 @@ sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked() } Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentController() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -925,7 +925,7 @@ Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentControl void SAL_CALL ChartDocumentWrapper::setCurrentController( const Reference< frame::XController >& Controller ) throw (container::NoSuchElementException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -933,7 +933,7 @@ void SAL_CALL ChartDocumentWrapper::setCurrentController( } Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -943,7 +943,7 @@ Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection( // ____ XComponent ____ void SAL_CALL ChartDocumentWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_bIsDisposed ) throw lang::DisposedException("ChartDocumentWrapper is disposed", @@ -1117,7 +1117,7 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const } void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -1125,7 +1125,7 @@ void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEv } void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -1134,7 +1134,7 @@ void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang:: // ____ XDrawPageSupplier ____ uno::Reference< drawing::XDrawPage > SAL_CALL ChartDocumentWrapper::getDrawPage() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return this->impl_getDrawPage(); } @@ -1149,7 +1149,7 @@ uno::Reference< drawing::XDrawPage > ChartDocumentWrapper::impl_getDrawPage() co uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( const OUString& aServiceSpecifier ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; @@ -1426,7 +1426,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceW const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_ENSURE( Arguments.getLength(), "createInstanceWithArguments: Warning: Arguments are ignored" ); (void)(Arguments); @@ -1435,7 +1435,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceW } uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { tServiceNameMap & rMap = lcl_getStaticServiceNameMap(); uno::Sequence< OUString > aResult( rMap.size()); @@ -1451,7 +1451,7 @@ uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceName // ____ XAggregation ____ void SAL_CALL ChartDocumentWrapper::setDelegator( const uno::Reference< uno::XInterface >& rDelegator ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_bIsDisposed ) { @@ -1482,7 +1482,7 @@ void SAL_CALL ChartDocumentWrapper::setDelegator( } uno::Any SAL_CALL ChartDocumentWrapper::queryAggregation( const uno::Type& rType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ChartDocumentWrapper_Base::queryInterface( rType ); } diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 21b269ab1aac..222b0ef24633 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -459,7 +459,7 @@ DataSeriesPointWrapper::DataSeriesPointWrapper( } void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw ( uno::Exception, uno::RuntimeException) + throw ( uno::Exception, uno::RuntimeException, std::exception) { OSL_PRECOND(aArguments.getLength() >= 1,"need at least 1 argument to initialize the DataSeriesPointWrapper: series reference + optional datapoint index"); @@ -504,7 +504,7 @@ DataSeriesPointWrapper::~DataSeriesPointWrapper() // ____ XComponent ____ void SAL_CALL DataSeriesPointWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -515,21 +515,21 @@ void SAL_CALL DataSeriesPointWrapper::dispose() void SAL_CALL DataSeriesPointWrapper::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL DataSeriesPointWrapper::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } // ____ XEventListener ____ void SAL_CALL DataSeriesPointWrapper::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } @@ -605,7 +605,7 @@ awt::Size DataSeriesPointWrapper::getCurrentSizeForReference() //XPropertyState beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); @@ -635,7 +635,7 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU } void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( m_eType == DATA_SERIES ) WrappedPropertySet::setPropertyToDefault( rPropertyName ); @@ -646,7 +646,7 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPro } } Any SAL_CALL DataSeriesPointWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; try @@ -748,7 +748,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope } void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if(rPropertyName == "Lines") { @@ -809,7 +809,7 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert } Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rPropertyName ) - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( m_eType == DATA_POINT ) { diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index 1c8aceaf3805..db2ee7e80090 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -78,7 +78,7 @@ public: // ___lang::XInitialization___ 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); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); //ReferenceSizePropertyProvider virtual void updateReferenceSize(); @@ -88,30 +88,30 @@ public: protected: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); virtual const std::vector< WrappedProperty* > createWrappedProperties(); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //own methods ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > getDataSeries(); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index cceaf7526c4a..1dc2dd19fda4 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -633,7 +633,7 @@ DiagramWrapper::~DiagramWrapper() // ____ XDiagram ____ OUString SAL_CALL DiagramWrapper::getDiagramType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OUString aRet; @@ -681,7 +681,7 @@ OUString SAL_CALL DiagramWrapper::getDiagramType() Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDataRowProperties( sal_Int32 nRow ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( nRow < 0 ) throw lang::IndexOutOfBoundsException("DataSeries index invalid", @@ -702,7 +702,7 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( nCol < 0 || nRow < 0 ) throw lang::IndexOutOfBoundsException("DataSeries index invalid", @@ -725,14 +725,14 @@ Reference< // ____ XShape (base of XDiagram) ____ awt::Point SAL_CALL DiagramWrapper::getPosition() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Point aPosition = ToPoint( m_spChart2ModelContact->GetDiagramRectangleIncludingAxes() ); return aPosition; } void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); @@ -757,7 +757,7 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL DiagramWrapper::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Size aSize = ToSize( m_spChart2ModelContact->GetDiagramRectangleIncludingAxes() ); return aSize; @@ -765,7 +765,7 @@ awt::Size SAL_CALL DiagramWrapper::getSize() void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); @@ -792,14 +792,14 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL DiagramWrapper::getShapeType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.Diagram" ); } // ____ XDiagramPositioning ____ -void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::RuntimeException) +void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); @@ -809,7 +809,7 @@ void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::Runti xDiaProps->setPropertyValue( "RelativePosition", Any() ); } } -::sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) @@ -821,7 +821,7 @@ void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::Runti } return true; } -void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException) +void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect ); @@ -829,7 +829,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectan if( xDiaProps.is() ) xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(true) ); } -::sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::RuntimeException) +::sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) @@ -845,11 +845,11 @@ void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectan } return false; } -awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes( ) throw (uno::RuntimeException) +awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes( ) throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetDiagramRectangleExcludingAxes(); } -void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException) +void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect ); @@ -857,24 +857,24 @@ void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectan if( xDiaProps.is() ) xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(false) ); } -awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes( ) throw (uno::RuntimeException) +awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes( ) throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetDiagramRectangleIncludingAxes(); } -void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException) +void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); awt::Rectangle aRect( m_spChart2ModelContact->SubstractAxisTitleSizes(rPositionRect) ); DiagramWrapper::setDiagramPositionIncludingAxes( aRect ); } -::com::sun::star::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetDiagramRectangleIncludingTitle(); } // ____ XAxisSupplier ____ Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< XAxis > xAxis; if(!nDimensionIndex) @@ -899,7 +899,7 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex ) } Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensionIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< XAxis > xAxis; if(!nDimensionIndex) @@ -919,7 +919,7 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensi // ____ XAxisZSupplier ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -929,7 +929,7 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -939,7 +939,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -949,7 +949,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xZAxis.is()) m_xZAxis = new AxisWrapper( AxisWrapper::Z_AXIS, m_spChart2ModelContact ); @@ -958,7 +958,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis() // ____ XTwoAxisXSupplier ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xSecondXAxis.is()) m_xSecondXAxis = new AxisWrapper( AxisWrapper::SECOND_X_AXIS, m_spChart2ModelContact ); @@ -967,7 +967,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis() // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -977,7 +977,7 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xXAxis.is()) m_xXAxis = new AxisWrapper( AxisWrapper::X_AXIS, m_spChart2ModelContact ); @@ -985,7 +985,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -995,7 +995,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -1006,7 +1006,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid() // ____ XTwoAxisYSupplier ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xSecondYAxis.is()) m_xSecondYAxis = new AxisWrapper( AxisWrapper::SECOND_Y_AXIS, m_spChart2ModelContact ); @@ -1015,7 +1015,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis() // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1025,7 +1025,7 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xYAxis.is()) m_xYAxis = new AxisWrapper( AxisWrapper::Y_AXIS, m_spChart2ModelContact ); @@ -1033,7 +1033,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1043,7 +1043,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1054,7 +1054,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid() // ____ XSecondAxisTitleSupplier ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getSecondaryAxis(0) ); @@ -1064,7 +1064,7 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle() } Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getSecondaryAxis(1) ); @@ -1076,7 +1076,7 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle() // ____ XStatisticDisplay ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getUpBar() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xUpBarWrapper.is() ) { @@ -1087,7 +1087,7 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDownBar() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xDownBarWrapper.is() ) { @@ -1098,7 +1098,7 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getMinMaxLine() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xMinMaxLineWrapper.is() ) { @@ -1109,7 +1109,7 @@ Reference< // ____ X3DDisplay ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xWall.is() ) { @@ -1120,7 +1120,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall() Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getFloor() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xFloor.is() ) { @@ -1131,7 +1131,7 @@ Reference< // ____ X3DDefaultSetter ____ void SAL_CALL DiagramWrapper::set3DSettingsToDefault() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1139,7 +1139,7 @@ void SAL_CALL DiagramWrapper::set3DSettingsToDefault() } void SAL_CALL DiagramWrapper::setDefaultRotation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1147,7 +1147,7 @@ void SAL_CALL DiagramWrapper::setDefaultRotation() } void SAL_CALL DiagramWrapper::setDefaultIllumination() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1156,7 +1156,7 @@ void SAL_CALL DiagramWrapper::setDefaultIllumination() // ____ XComponent ____ void SAL_CALL DiagramWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this ))); @@ -1178,14 +1178,14 @@ void SAL_CALL DiagramWrapper::dispose() void SAL_CALL DiagramWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL DiagramWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -2000,14 +2000,14 @@ void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue // ____ XDiagramProvider ____ Reference< chart2::XDiagram > SAL_CALL DiagramWrapper::getDiagram() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->getChart2Diagram(); } void SAL_CALL DiagramWrapper::setDiagram( const Reference< chart2::XDiagram >& /*xDiagram*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo: remove this method from interface OSL_FAIL("DiagramWrapper::setDiagram is not implemented, should be removed and not be called" ); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 32cfa14092d6..8ea94cbdd0ff 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -86,151 +86,151 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDiagram ____ virtual OUString SAL_CALL getDiagramType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XShape (base of XDiagram) ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAxisSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAxisZSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getZAxisTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getZMainGrid() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getZHelpGrid() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getZAxis() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTwoAxisXSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getSecondaryXAxis() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getXAxisTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getXAxis() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getXMainGrid() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getXHelpGrid() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTwoAxisYSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getSecondaryYAxis() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getYAxisTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getYAxis() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getYHelpGrid() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getYMainGrid() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XSecondAxisTitleSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getSecondXAxisTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getSecondYAxisTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XStatisticDisplay ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getUpBar() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDownBar() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinMaxLine() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ X3DDisplay ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getWall() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getFloor() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ X3DDefaultSetter ____ - virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDiagramPositioning ____ - virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDiagramPositionExcludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isExcludingDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDiagramPositionIncludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDiagramPositionExcludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isExcludingDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDiagramPositionIncludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDiagramProvider ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL getDiagram() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index 412dc0a2ac12..57efc982debc 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -113,7 +113,7 @@ void GridWrapper::getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDime // ____ XComponent ____ void SAL_CALL GridWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -123,14 +123,14 @@ void SAL_CALL GridWrapper::dispose() void SAL_CALL GridWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL GridWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index 966501baa3c0..6de2a04153b2 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -66,13 +66,13 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 9153da8da659..c275e3796797 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -286,13 +286,13 @@ LegendWrapper::~LegendWrapper() // ____ XShape ____ awt::Point SAL_CALL LegendWrapper::getPosition() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetLegendPosition(); } void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); if( xProp.is() ) @@ -308,14 +308,14 @@ void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL LegendWrapper::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetLegendSize(); } void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); if( xProp.is() ) @@ -333,14 +333,14 @@ void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL LegendWrapper::getShapeType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartLegend" ); } // ____ XComponent ____ void SAL_CALL LegendWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -351,14 +351,14 @@ void SAL_CALL LegendWrapper::dispose() void SAL_CALL LegendWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL LegendWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 07f61462d30a..eb1bb481e824 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -64,28 +64,28 @@ public: // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index b25c0d108659..841df09ad2c1 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -136,7 +136,7 @@ MinMaxLineWrapper::~MinMaxLineWrapper() // ____ XComponent ____ void SAL_CALL MinMaxLineWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -144,14 +144,14 @@ void SAL_CALL MinMaxLineWrapper::dispose() void SAL_CALL MinMaxLineWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL MinMaxLineWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -163,13 +163,13 @@ void SAL_CALL MinMaxLineWrapper::removeEventListener( //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL MinMaxLineWrapper::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticMinMaxLineWrapperInfo::get(); } void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropSet(0); @@ -206,7 +206,7 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName } } uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -248,22 +248,22 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rProperty } void SAL_CALL MinMaxLineWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -271,7 +271,7 @@ void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const OUString& / //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq ) - throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); for(sal_Int32 nN=0; nN<nMinCount; nN++) @@ -289,7 +289,7 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUStrin //todo: store unknown properties elsewhere } uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const uno::Sequence< OUString >& rNameSeq ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -306,27 +306,27 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const u void SAL_CALL MinMaxLineWrapper::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } //XPropertyState beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) ) return beans::PropertyState_DEFAULT_VALUE; @@ -340,7 +340,7 @@ beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUStrin return beans::PropertyState_DIRECT_VALUE; } uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertyStates( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -355,13 +355,13 @@ uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertySta return aRetSeq; } void SAL_CALL MinMaxLineWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) ); } uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const tPropertyValueMap& rStaticDefaults = *StaticMinMaxLineWrapperDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( getInfoHelper().getHandleByName( rPropertyName ) ) ); @@ -373,7 +373,7 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rProper //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = *StaticMinMaxLineWrapperPropertyArray::get(); for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++) @@ -383,7 +383,7 @@ void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault( ) } } void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { @@ -392,7 +392,7 @@ void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OU } } uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index e4982af08044..0a56a4cdc281 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -65,44 +65,44 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //XPropertySet - 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); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); private: //methods ::cppu::IPropertyArrayHelper& getInfoHelper(); diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 9ca382f98f1b..3d3dee6c3191 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -215,13 +215,13 @@ TitleWrapper::~TitleWrapper() // ____ XShape ____ awt::Point SAL_CALL TitleWrapper::getPosition() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetTitlePosition( this->getTitleObject() ); } void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropertySet( this->getInnerPropertySet() ); if(xPropertySet.is()) @@ -237,28 +237,28 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL TitleWrapper::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetTitleSize( this->getTitleObject() ); } void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ ) throw (beans::PropertyVetoException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set size of title" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL TitleWrapper::getShapeType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartTitle" ); } // ____ XComponent ____ void SAL_CALL TitleWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -269,14 +269,14 @@ void SAL_CALL TitleWrapper::dispose() void SAL_CALL TitleWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL TitleWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -346,7 +346,7 @@ void TitleWrapper::setFastCharacterPropertyValue( // WrappedPropertySet void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -358,7 +358,7 @@ void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, con } Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); @@ -370,7 +370,7 @@ Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName ) } beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); @@ -393,7 +393,7 @@ beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rP return aState; } void SAL_CALL TitleWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -405,7 +405,7 @@ void SAL_CALL TitleWrapper::setPropertyToDefault( const OUString& rPropertyName WrappedPropertySet::setPropertyToDefault( rPropertyName ); } Any SAL_CALL TitleWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -429,7 +429,7 @@ Any SAL_CALL TitleWrapper::getPropertyDefault( const OUString& rPropertyName ) } void SAL_CALL TitleWrapper::addPropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -442,7 +442,7 @@ void SAL_CALL TitleWrapper::addPropertyChangeListener( const OUString& rProperty WrappedPropertySet::addPropertyChangeListener( rPropertyName, xListener ); } void SAL_CALL TitleWrapper::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index bb087ce0faf4..dc3d277a010f 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -64,28 +64,28 @@ public: protected: // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // character properties have to be handled differently (via the XFormattedString elements) void getFastCharacterPropertyValue( sal_Int32 nHandle, ::com::sun::star::uno::Any& rValue ); @@ -93,16 +93,16 @@ protected: throw (::com::sun::star::uno::Exception); // ____ WrappedPropertySet ____ - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index f45a9b5e0b42..e3be3b99515e 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -139,7 +139,7 @@ UpDownBarWrapper::~UpDownBarWrapper() // ____ XComponent ____ void SAL_CALL UpDownBarWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -147,14 +147,14 @@ void SAL_CALL UpDownBarWrapper::dispose() void SAL_CALL UpDownBarWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL UpDownBarWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -166,12 +166,12 @@ void SAL_CALL UpDownBarWrapper::removeEventListener( //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticUpDownBarWrapperInfo::get(); } void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropSet(0); @@ -193,7 +193,7 @@ void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName, xPropSet->setPropertyValue( rPropertyName, rValue ); } uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -219,22 +219,22 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyN } void SAL_CALL UpDownBarWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -242,7 +242,7 @@ void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const OUString& /* //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq ) - throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); for(sal_Int32 nN=0; nN<nMinCount; nN++) @@ -260,7 +260,7 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString //todo: store unknown properties elsewhere } uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const uno::Sequence< OUString >& rNameSeq ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -275,24 +275,24 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const un return aRetSeq; } void SAL_CALL UpDownBarWrapper::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } //XPropertyState beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { uno::Any aDefault( this->getPropertyDefault( rPropertyName ) ); uno::Any aValue( this->getPropertyValue( rPropertyName ) ); @@ -303,7 +303,7 @@ beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString return beans::PropertyState_DIRECT_VALUE; } uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStates( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -318,13 +318,13 @@ uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStat return aRetSeq; } void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) ); } uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const tPropertyValueMap& rStaticDefaults = *StaticUpDownBarWrapperDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( getInfoHelper().getHandleByName( rPropertyName ) ) ); @@ -336,7 +336,7 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropert //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = *StaticUpDownBarWrapperPropertyArray::get(); for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++) @@ -346,7 +346,7 @@ void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( ) } } void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { @@ -355,7 +355,7 @@ void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUS } } uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index 8f7fd7702d7a..579deb21bcdd 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -64,44 +64,44 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //XPropertySet - 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); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); private: //methods ::cppu::IPropertyArrayHelper& getInfoHelper(); diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 3ff1d7709b3d..701b86c9e881 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -95,7 +95,7 @@ WallFloorWrapper::~WallFloorWrapper() // ____ XComponent ____ void SAL_CALL WallFloorWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -106,14 +106,14 @@ void SAL_CALL WallFloorWrapper::dispose() void SAL_CALL WallFloorWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL WallFloorWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index e57f5cddea01..abb01b19a1be 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -53,13 +53,13 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx index dcc65e2507fe..55944a08a9d6 100644 --- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx @@ -41,21 +41,21 @@ RangeSelectionListener::~RangeSelectionListener() // ____ XRangeSelectionListener ____ void SAL_CALL RangeSelectionListener::done( const sheet::RangeSelectionEvent& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aRange = aEvent.RangeDescriptor; m_rParent.listeningFinished( m_aRange ); } void SAL_CALL RangeSelectionListener::aborted( const sheet::RangeSelectionEvent& /*aEvent*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_rParent.listeningFinished( m_aRange ); } // ____ XEventListener ____ void SAL_CALL RangeSelectionListener::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_rParent.disposingRangeSelection(); } diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index b212b598efac..f958c7f469dd 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -46,7 +46,7 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg() } } // lang::XServiceInfo -OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException, std::exception) { return getImplementationName_Static(); } @@ -56,7 +56,7 @@ OUString ChartTypeUnoDlg::getImplementationName_Static() throw(uno::RuntimeExcep return CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME; } -::comphelper::StringSequence SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException) +::comphelper::StringSequence SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -67,7 +67,7 @@ uno::Sequence< OUString > ChartTypeUnoDlg::getSupportedServiceNames_Static() aSNS.getArray()[ 0 ] = CHART_TYPE_DIALOG_SERVICE_NAME; return aSNS; } -uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId( void ) throw( uno::RuntimeException ) +uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId( void ) throw( uno::RuntimeException, std::exception ) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); @@ -89,7 +89,7 @@ Dialog* ChartTypeUnoDlg::createDialog(Window* _pParent) { return new ChartTypeDialog( _pParent, m_xChartModel, m_aContext ); } -uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() throw(uno::RuntimeException) +uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() throw(uno::RuntimeException, std::exception) { return createPropertySetInfo( getInfoHelper() ); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index b15a43f97fe2..d38280729ed0 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -74,7 +74,7 @@ APPHELPER_XSERVICEINFO_IMPL(CreationWizardUnoDlg,CHART_WIZARD_DIALOG_SERVICE_IMP } // XInterface -uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType ) throw (uno::RuntimeException) +uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType ) throw (uno::RuntimeException, std::exception) { return OComponentHelper::queryInterface( aType ); } @@ -86,7 +86,7 @@ void SAL_CALL CreationWizardUnoDlg::release() throw () { OComponentHelper::release(); } -uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType ) throw (uno::RuntimeException) +uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType ) throw (uno::RuntimeException, std::exception) { if (rType == ::getCppuType( (uno::Reference< ui::dialogs::XExecutableDialog > const *)0 )) { @@ -118,7 +118,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rTyp #define LCL_CPPUTYPE(t) (::getCppuType( reinterpret_cast< const uno::Reference<t> *>(0))) -uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeException) +uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeException, std::exception) { static uno::Sequence< uno::Type > aTypeList; @@ -146,13 +146,13 @@ namespace class theCreationWizardUnoDlgImplementationId : public rtl::Static< UnoTunnelIdInit, theCreationWizardUnoDlgImplementationId > {}; } -uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId( void ) throw( uno::RuntimeException ) +uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId( void ) throw( uno::RuntimeException, std::exception ) { return theCreationWizardUnoDlgImplementationId::get().getSeq(); } // XTerminateListener -void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) throw( frame::TerminationVetoException, uno::RuntimeException) +void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) throw( frame::TerminationVetoException, uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -164,18 +164,18 @@ void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& / } } -void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ ) throw (uno::RuntimeException) +void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ ) throw (uno::RuntimeException, std::exception) { // we are going down, so dispose us! dispose(); } -void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) +void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) { //Listener should deregister himself and relaese all references to the closing object. } -void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) throw(uno::RuntimeException) +void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) throw(uno::RuntimeException, std::exception) { } void CreationWizardUnoDlg::createDialogOnDemand() @@ -217,7 +217,7 @@ IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent*, pEvent ) return 0; } -sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException) +sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException, std::exception) { sal_Int16 nRet = RET_CANCEL; { @@ -233,7 +233,7 @@ sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException return nRet; } -void SAL_CALL CreationWizardUnoDlg::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException) +void SAL_CALL CreationWizardUnoDlg::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException, std::exception) { const uno::Any* pArguments = aArguments.getConstArray(); for(sal_Int32 i=0; i<aArguments.getLength(); ++i, ++pArguments) @@ -281,7 +281,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing() //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); return 0; @@ -290,7 +290,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getProp void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyName , const uno::Any& rValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException - , lang::WrappedTargetException, uno::RuntimeException) + , lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( rPropertyName == "Position" ) { @@ -325,7 +325,7 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyN } uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aRet; if( rPropertyName == "Position" ) @@ -365,25 +365,25 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope void SAL_CALL CreationWizardUnoDlg::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL CreationWizardUnoDlg::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 3c021d2b461f..6dce61bf60f6 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -222,11 +222,11 @@ protected: AccessibleUniqueId GetId() const; // ________ XComponent ________ - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::removeEventListener(xListener); } // ________ WeakComponentImplHelper (XComponent::dispose) ________ @@ -234,35 +234,35 @@ protected: // ________ XAccessible ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleContext ________ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// @return AccessibleRole.SHAPE virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // has to be implemented by derived classes // virtual OUString SAL_CALL getAccessibleName() // throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // has to be implemented by derived classes // virtual OUString SAL_CALL getAccessibleDescription() // throw (::com::sun::star::uno::RuntimeException); @@ -270,47 +270,47 @@ protected: // ________ XAccessibleComponent ________ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // has to be defined in derived classes virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XEventListener ________ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleEventBroadcaster ________ virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: enum eColorType diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index f3938c790fb8..31a43c08c8c3 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -77,29 +77,29 @@ public: 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); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ view::XSelectionChangeListener ____ - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XEventListener ________ - 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); // ________ XAccessibleContext ________ virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleComponent ________ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ________ AccessibleChartElement ________ diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index 474530e367c2..6da06466ce70 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -67,32 +67,32 @@ public: 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); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XAccessibleContext ____ virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( ::sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); private: ::accessibility::AccessibleTextHelper * m_pTextHelper; diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 3dfac058dabe..fde19f4cd2b8 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -88,74 +88,74 @@ protected: // ____ chart::XChartDocument ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getSubTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getLegend() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getArea() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > SAL_CALL getDiagram() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartData > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL attachData( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartData >& xData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModel ____ virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getURL() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL lockControllers() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL unlockControllers() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasControllersLocked() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL getCurrentController() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XInterface (for new interfaces) ____ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ::utl::OEventListenerAdapter ____ virtual void _disposing( const ::com::sun::star::lang::EventObject& rSource ); @@ -163,30 +163,30 @@ protected: // ____ XDrawPageSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getDrawPage() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XMultiServiceFactory ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAggregation ____ virtual void SAL_CALL setDelegator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rDelegator ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WrappedPropertySet ____ virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index 1226ef200153..bab90fb85f2f 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -52,13 +52,13 @@ public: protected: // ____ XRangeSelectionListener ____ virtual void SAL_CALL done( const ::com::sun::star::sheet::RangeSelectionEvent& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL aborted( const ::com::sun::star::sheet::RangeSelectionEvent& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: RangeSelectionListenerParent & m_rParent; diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index a7d02af8c7bf..70d5ce8515e3 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -49,13 +49,13 @@ private: virtual Dialog* createDialog(Window* _pParent); // XTypeProvider - virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - 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); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // OPropertyArrayUsageHelper diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 1e9d019939a0..b2d772b4ff67 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -54,40 +54,40 @@ public: virtual ~CreationWizardUnoDlg(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo APPHELPER_XSERVICEINFO_DECL() APPHELPER_SERVICE_FACTORY_HELPER(CreationWizardUnoDlg) // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) 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& aTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XInitialization - 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); // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - 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); //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::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); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); DECL_LINK( DialogEventHdl, VclWindowEvent* ); diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index f52c435684f1..401351f970c3 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -330,7 +330,7 @@ uno::Sequence< OUString > ChartController::getSupportedServiceNames_Static() void SAL_CALL ChartController::attachFrame( const uno::Reference<frame::XFrame>& xFrame ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -495,7 +495,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent } sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XModel > & xModel ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { impl_invalidateAccessible(); @@ -588,7 +588,7 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo } uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //provides access to owner frame of this controller //return the frame containing this controller @@ -597,7 +597,7 @@ uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame() } uno::Reference< frame::XModel > SAL_CALL ChartController::getModel() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //provides access to currently attached model //returns the currently attached model @@ -611,7 +611,7 @@ uno::Reference< frame::XModel > SAL_CALL ChartController::getModel() } uno::Any SAL_CALL ChartController::getViewData() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //provides access to current view status //set of data that can be used to restore the current view status at later time @@ -630,7 +630,7 @@ uno::Any SAL_CALL ChartController::getViewData() void SAL_CALL ChartController::restoreViewData( const uno::Any& /* Value */ ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //restores the view status using the data gotten from a previous call to XController::getViewData() @@ -642,7 +642,7 @@ void SAL_CALL ChartController::restoreViewData( } sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //is called to prepare the controller for closing the view //bSuspend==true: force the controller to suspend his work @@ -701,7 +701,7 @@ void ChartController::impl_deleteDrawViewController() // XComponent (base of XController) void SAL_CALL ChartController::dispose() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { try { @@ -802,7 +802,7 @@ void SAL_CALL ChartController::dispose() void SAL_CALL ChartController::addEventListener( const uno::Reference<lang::XEventListener>& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? @@ -814,7 +814,7 @@ void SAL_CALL ChartController::addEventListener( void SAL_CALL ChartController::removeEventListener( const uno::Reference<lang::XEventListener>& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( m_aLifeTimeManager.impl_isDisposed(false) ) @@ -828,7 +828,7 @@ void SAL_CALL ChartController::removeEventListener( void SAL_CALL ChartController::queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) - throw(util::CloseVetoException, uno::RuntimeException) + throw(util::CloseVetoException, uno::RuntimeException, std::exception) { //do not use the m_aControllerMutex here because this call is not allowed to block @@ -860,7 +860,7 @@ void SAL_CALL ChartController::queryClosing( void SAL_CALL ChartController::notifyClosing( const lang::EventObject& rSource ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //Listener should deregister himself and relaese all references to the closing object. @@ -909,7 +909,7 @@ bool ChartController::impl_releaseThisModel( // util::XEventListener (base of XCloseListener) void SAL_CALL ChartController::disposing( const lang::EventObject& rSource ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( !impl_releaseThisModel( rSource.Source )) { @@ -922,7 +922,7 @@ void SAL_CALL ChartController::layoutEvent( const lang::EventObject& aSource, sal_Int16 eLayoutEvent, const uno::Any& /* aInfo */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( eLayoutEvent == frame::LayoutManagerEvents::MERGEDMENUBAR ) { @@ -1003,7 +1003,7 @@ uno::Reference<frame::XDispatch> SAL_CALL const util::URL& rURL, const OUString& rTargetFrameName, sal_Int32 /* nSearchFlags */) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if ( !m_aLifeTimeManager.impl_isDisposed() && getModel().is() ) { @@ -1016,7 +1016,7 @@ uno::Reference<frame::XDispatch> SAL_CALL uno::Sequence<uno::Reference<frame::XDispatch > > ChartController::queryDispatches( const uno::Sequence<frame::DispatchDescriptor>& xDescripts ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if ( !m_aLifeTimeManager.impl_isDisposed() ) { @@ -1214,7 +1214,7 @@ void SAL_CALL ChartController::dispatch( void SAL_CALL ChartController::addStatusListener( const uno::Reference<frame::XStatusListener >& /* xControl */, const util::URL& /* aURL */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo } @@ -1222,7 +1222,7 @@ void SAL_CALL ChartController::addStatusListener( void SAL_CALL ChartController::removeStatusListener( const uno::Reference<frame::XStatusListener >& /* xControl */, const util::URL& /* aURL */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo } @@ -1230,14 +1230,14 @@ void SAL_CALL ChartController::removeStatusListener( // XContextMenuInterception (optional interface) void SAL_CALL ChartController::registerContextMenuInterceptor( const uno::Reference< ui::XContextMenuInterceptor >& /* xInterceptor */) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo } void SAL_CALL ChartController::releaseContextMenuInterceptor( const uno::Reference< ui::XContextMenuInterceptor > & /* xInterceptor */) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo } @@ -1310,7 +1310,7 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward ) uno::Reference< uno::XInterface > SAL_CALL ChartController::createInstance( const OUString& aServiceSpecifier ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; @@ -1323,7 +1323,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartController::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& /* Arguments */ ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { // ignore Arguments return createInstance( ServiceSpecifier ); @@ -1331,7 +1331,7 @@ uno::Reference< uno::XInterface > SAL_CALL uno::Sequence< OUString > SAL_CALL ChartController::getAvailableServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aServiceNames(1); aServiceNames[0] = CHART_ACCESSIBLE_TEXT_SERVICE_NAME; @@ -1341,7 +1341,7 @@ uno::Sequence< OUString > SAL_CALL // ____ XModifyListener ____ void SAL_CALL ChartController::modified( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // the source can also be a subobject of the ChartModel // @todo: change the source in ChartModel to always be the model itself ? diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index c0871e9f14c8..a65dc4d07dfa 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -165,43 +165,43 @@ public: virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL attachModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL - getFrame() throw (::com::sun::star::uno::RuntimeException); + getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL - getModel() throw (::com::sun::star::uno::RuntimeException); + getModel() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL - getViewData() throw (::com::sun::star::uno::RuntimeException); + getViewData() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XComponent (base of XController) virtual void SAL_CALL - dispose() throw (::com::sun::star::uno::RuntimeException); + dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XDispatchProvider (required interface) virtual ::com::sun::star::uno::Reference< @@ -209,43 +209,43 @@ public: queryDispatch( const ::com::sun::star::util::URL& rURL , const OUString& rTargetFrameName , sal_Int32 nSearchFlags) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor > & xDescripts) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::view::XSelectionSupplier (optional interface) virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& rSelection ) - throw ( com::sun::star::lang::IllegalArgumentException ); + throw ( com::sun::star::lang::IllegalArgumentException, std::exception ); virtual ::com::sun::star::uno::Any SAL_CALL - getSelection() throw (::com::sun::star::uno::RuntimeException); + getSelection() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< com::sun::star::view::XSelectionChangeListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< com::sun::star::view::XSelectionChangeListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::ui::XContextMenuInterception (optional interface) virtual void SAL_CALL registerContextMenuInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XContextMenuInterceptor > & xInterceptor) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL releaseContextMenuInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XContextMenuInterceptor > & xInterceptor) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //additional interfaces @@ -254,16 +254,16 @@ public: queryClosing( const ::com::sun::star::lang::EventObject& Source , sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XEventListener (base of XCloseListener and XModifyListener) virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XDispatch @@ -278,114 +278,114 @@ public: addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl , const ::com::sun::star::util::URL& aURL ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl , const ::com::sun::star::util::URL& aURL ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::awt::XWindow virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setVisible( sal_Bool Visible ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setEnable( sal_Bool Enable ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - setFocus() throw (::com::sun::star::uno::RuntimeException); + setFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang XMultiServiceFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XModifyListener virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XModeChangeListener virtual void SAL_CALL modeChanged( @@ -398,7 +398,7 @@ public: const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // chart2::WindowController virtual void PrePaint(); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 9b75609a020d..d0fda11ad522 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -231,7 +231,7 @@ void SAL_CALL ChartController::setPosSize( sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -282,7 +282,7 @@ void SAL_CALL ChartController::setPosSize( } awt::Rectangle SAL_CALL ChartController::getPosSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo awt::Rectangle aRet(0, 0, 0, 0); @@ -295,7 +295,7 @@ awt::Rectangle SAL_CALL ChartController::getPosSize() } void SAL_CALL ChartController::setVisible( sal_Bool Visible ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -305,7 +305,7 @@ void SAL_CALL ChartController::setVisible( sal_Bool Visible ) } void SAL_CALL ChartController::setEnable( sal_Bool Enable ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -315,7 +315,7 @@ void SAL_CALL ChartController::setEnable( sal_Bool Enable ) } void SAL_CALL ChartController::setFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -326,7 +326,7 @@ void SAL_CALL ChartController::setFocus() void SAL_CALL ChartController::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -337,7 +337,7 @@ void SAL_CALL ChartController::addWindowListener( void SAL_CALL ChartController::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -348,7 +348,7 @@ void SAL_CALL ChartController::removeWindowListener( void SAL_CALL ChartController::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -359,7 +359,7 @@ void SAL_CALL ChartController::addFocusListener( void SAL_CALL ChartController::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -370,7 +370,7 @@ void SAL_CALL ChartController::removeFocusListener( void SAL_CALL ChartController::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -381,7 +381,7 @@ void SAL_CALL ChartController::addKeyListener( void SAL_CALL ChartController::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -392,7 +392,7 @@ void SAL_CALL ChartController::removeKeyListener( void SAL_CALL ChartController::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -403,7 +403,7 @@ void SAL_CALL ChartController::addMouseListener( void SAL_CALL ChartController::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -414,7 +414,7 @@ void SAL_CALL ChartController::removeMouseListener( void SAL_CALL ChartController::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -425,7 +425,7 @@ void SAL_CALL ChartController::addMouseMotionListener( void SAL_CALL ChartController::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -436,7 +436,7 @@ void SAL_CALL ChartController::removeMouseMotionListener( void SAL_CALL ChartController::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -447,7 +447,7 @@ void SAL_CALL ChartController::addPaintListener( void SAL_CALL ChartController::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -1594,7 +1594,7 @@ bool ChartController::requestQuickHelp( // XSelectionSupplier (optional interface) sal_Bool SAL_CALL ChartController ::select( const uno::Any& rSelection ) - throw( lang::IllegalArgumentException ) + throw( lang::IllegalArgumentException, std::exception ) { bool bSuccess = false; @@ -1646,7 +1646,7 @@ bool ChartController::requestQuickHelp( } uno::Any SAL_CALL ChartController -::getSelection() throw(uno::RuntimeException) +::getSelection() throw(uno::RuntimeException, std::exception) { uno::Any aReturn; if ( m_aSelection.hasSelection() ) @@ -1668,7 +1668,7 @@ bool ChartController::requestQuickHelp( void SAL_CALL ChartController ::addSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener > & xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? @@ -1681,7 +1681,7 @@ bool ChartController::requestQuickHelp( void SAL_CALL ChartController ::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener > & xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( impl_isDisposedOrSuspended() ) //@todo? allow removing of listeners in suspend mode? diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index 9d06b6aebb29..f0b5fed3fa73 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -71,7 +71,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT sal_Bool SAL_CALL ChartFrameLoader ::load( const uno::Sequence< beans::PropertyValue >& rMediaDescriptor , const uno::Reference<frame::XFrame >& xFrame ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo ? need to add as terminate listener to desktop? @@ -177,7 +177,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT } void SAL_CALL ChartFrameLoader -::cancel() throw (uno::RuntimeException) +::cancel() throw (uno::RuntimeException, std::exception) { m_oCancelFinished.reset(); m_bCancelRequired = sal_True; diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index bd37644a12b7..75959c134289 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -64,10 +64,10 @@ public: ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - cancel() throw (::com::sun::star::uno::RuntimeException); + cancel() throw (::com::sun::star::uno::RuntimeException, std::exception); }; } //namespace chart diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index cee92934ece5..6b060b76f9f1 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -88,11 +88,11 @@ void SAL_CALL CommandDispatch::disposing() // ____ XDispatch ____ void SAL_CALL CommandDispatch::dispatch( const util::URL& /* URL */, const Sequence< beans::PropertyValue >& /* Arguments */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) {} void SAL_CALL CommandDispatch::addStatusListener( const Reference< frame::XStatusListener >& Control, const util::URL& URL ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { tListenerMap::iterator aIt( m_aListeners.find( URL.Complete )); if( aIt == m_aListeners.end()) @@ -108,7 +108,7 @@ void SAL_CALL CommandDispatch::addStatusListener( const Reference< frame::XStatu } void SAL_CALL CommandDispatch::removeStatusListener( const Reference< frame::XStatusListener >& Control, const util::URL& URL ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { tListenerMap::iterator aIt( m_aListeners.find( URL.Complete )); if( aIt != m_aListeners.end()) @@ -117,14 +117,14 @@ void SAL_CALL CommandDispatch::removeStatusListener( const Reference< frame::XSt // ____ XModifyListener ____ void SAL_CALL CommandDispatch::modified( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { fireAllStatusEvents( 0 ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL CommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) {} void CommandDispatch::fireAllStatusEvents( diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index 8e672b693c11..5555edf47952 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -101,15 +101,15 @@ protected: virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& Control, const ::com::sun::star::util::URL& URL ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& Control, const ::com::sun::star::util::URL& URL ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -118,12 +118,12 @@ protected: // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index d88a263af8fb..07fdf49a0791 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -744,7 +744,7 @@ void ControllerCommandDispatch::fireStatusEvent( void SAL_CALL ControllerCommandDispatch::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& Arguments ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( commandAvailable( URL.Complete )) m_xDispatch->dispatch( URL, Arguments ); @@ -761,7 +761,7 @@ void SAL_CALL ControllerCommandDispatch::disposing() // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ControllerCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xController.clear(); m_xDispatch.clear(); @@ -770,7 +770,7 @@ void SAL_CALL ControllerCommandDispatch::disposing( const lang::EventObject& /* // ____ XModifyListener ____ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { bool bUpdateCommandAvailability = false; @@ -796,7 +796,7 @@ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEve // ____ XSelectionChangeListener ____ void SAL_CALL ControllerCommandDispatch::selectionChanged( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // Update the "ControllerState" Struct. if( m_apControllerState.get() && m_xController.is()) diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index 84516d2175d2..ca321497da4c 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -70,7 +70,7 @@ protected: virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -79,7 +79,7 @@ protected: // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void fireStatusEvent( const OUString & rURL, @@ -88,12 +88,12 @@ protected: // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: void fireStatusEventForURLImpl( diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 5a46b7b199f3..d8d8b956345d 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -227,7 +227,7 @@ void DrawCommandDispatch::disposing() // XEventListener void DrawCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index 976c40e48acd..0e2c87b50572 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -52,7 +52,7 @@ protected: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // state of a feature virtual FeatureState getState( const OUString& rCommand ); diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index bb2459a58642..5205143ea541 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -262,7 +262,7 @@ ElementSelectorToolbarController::~ElementSelectorToolbarController() { } // XInterface -Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType ) throw (RuntimeException) +Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn = ToolboxController::queryInterface(_rType); if (!aReturn.hasValue()) @@ -277,11 +277,11 @@ void SAL_CALL ElementSelectorToolbarController::release() throw () { ToolboxController::release(); } -void SAL_CALL ElementSelectorToolbarController::initialize( const Sequence< Any >& rArguments ) throw (Exception, RuntimeException) +void SAL_CALL ElementSelectorToolbarController::initialize( const Sequence< Any >& rArguments ) throw (Exception, RuntimeException, std::exception) { ToolboxController::initialize(rArguments); } -void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException ) +void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException, std::exception ) { if( m_apSelectorListBox.get() ) { @@ -296,7 +296,7 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat } } uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::createItemWindow( const uno::Reference< awt::XWindow >& xParent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< awt::XWindow > xItemWindow; if( !m_apSelectorListBox.get() ) diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 4971cbb9c39f..c0c32ca22d55 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -83,16 +83,16 @@ public: APPHELPER_SERVICE_FACTORY_HELPER(ElementSelectorToolbarController) // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XInitialization - 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); // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XToolbarController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: //no default constructor diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index f530700f5372..e9721f1d738e 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -75,7 +75,7 @@ void FeatureCommandDispatchBase::fireStatusEvent( const OUString& rURL, // XDispatch void FeatureCommandDispatchBase::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& Arguments ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OUString aCommand( URL.Complete ); if ( getState( aCommand ).bEnabled ) diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index 9d9a8ec2127a..90ffa284af7f 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -63,7 +63,7 @@ protected: // XDispatch virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void fireStatusEvent( const OUString& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xSingleListener ); diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index f239af40ef2d..46f1afef7149 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -76,7 +76,7 @@ void ShapeController::disposing() // XEventListener void ShapeController::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index 501004643cb4..e7bb9f63388d 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -50,7 +50,7 @@ protected: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // state of a feature virtual FeatureState getState( const OUString& rCommand ); diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index f5875d8edcda..284cf61a1efc 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -35,7 +35,7 @@ using ::com::sun::star::uno::Sequence; namespace chart { -OUString ShapeToolbarController::getImplementationName() throw (uno::RuntimeException) +OUString ShapeToolbarController::getImplementationName() throw (uno::RuntimeException, std::exception) { return getImplementationName_Static(); } @@ -52,12 +52,12 @@ Sequence< OUString > ShapeToolbarController::getSupportedServiceNames_Static() t return aSupported; } -::sal_Bool ShapeToolbarController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) +::sal_Bool ShapeToolbarController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > ShapeToolbarController::getSupportedServiceNames() throw (uno::RuntimeException) +Sequence< OUString > ShapeToolbarController::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -82,7 +82,7 @@ ShapeToolbarController::~ShapeToolbarController() } // ::com::sun::star::uno::XInterface -uno::Any ShapeToolbarController::queryInterface( const uno::Type& rType ) throw (uno::RuntimeException) +uno::Any ShapeToolbarController::queryInterface( const uno::Type& rType ) throw (uno::RuntimeException, std::exception) { uno::Any aReturn = ToolboxController::queryInterface( rType ); if ( !aReturn.hasValue() ) @@ -103,7 +103,7 @@ void ShapeToolbarController::release() throw () } // ::com::sun::star::lang::XInitialization -void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments ) throw (uno::Exception, uno::RuntimeException) +void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments ) throw (uno::Exception, uno::RuntimeException, std::exception) { ToolboxController::initialize( rArguments ); SolarMutexGuard aSolarMutexGuard; @@ -175,7 +175,7 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments } // ::com::sun::star::frame::XStatusListener -void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException ) +void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); TCommandState::iterator aFind = m_aStates.find( Event.FeatureURL.Complete ); @@ -217,7 +217,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even } // ::com::sun::star::frame::XToolbarController -Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno::RuntimeException) +Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -232,7 +232,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno } // ::com::sun::star::frame::XSubToolbarController -::sal_Bool ShapeToolbarController::opensSubToolbar() throw (uno::RuntimeException) +::sal_Bool ShapeToolbarController::opensSubToolbar() throw (uno::RuntimeException, std::exception) { return ( m_nSlotId == SID_DRAWTBX_CS_BASIC || m_nSlotId == SID_DRAWTBX_CS_SYMBOL || @@ -242,7 +242,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno m_nSlotId == SID_DRAWTBX_CS_STAR ); } -OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException) +OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); @@ -254,7 +254,7 @@ OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeExceptio return OUString(); } -void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException) +void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -267,7 +267,7 @@ void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw } } -void ShapeToolbarController::updateImage() throw (uno::RuntimeException) +void ShapeToolbarController::updateImage() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 63ff304e959a..2a4068e5a615 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -57,35 +57,35 @@ public: virtual ~ShapeToolbarController(); // ::com::sun::star::uno::XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // needed by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ) 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 >& rArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XToolbarController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XSubToolbarController - virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index 94acd29d7045..4fb944da814f 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -89,7 +89,7 @@ void StatusBarCommandDispatch::fireStatusEvent( void SAL_CALL StatusBarCommandDispatch::dispatch( const util::URL& /* URL */, const Sequence< beans::PropertyValue >& /* Arguments */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing to do here } @@ -104,7 +104,7 @@ void SAL_CALL StatusBarCommandDispatch::disposing() // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL StatusBarCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifiable.clear(); m_xSelectionSupplier.clear(); @@ -112,7 +112,7 @@ void SAL_CALL StatusBarCommandDispatch::disposing( const lang::EventObject& /* S // ____ XModifyListener ____ void SAL_CALL StatusBarCommandDispatch::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_xModifiable.is()) m_bIsModified = m_xModifiable->isModified(); @@ -122,7 +122,7 @@ void SAL_CALL StatusBarCommandDispatch::modified( const lang::EventObject& aEven // ____ XSelectionChangeListener ____ void SAL_CALL StatusBarCommandDispatch::selectionChanged( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_xSelectionSupplier.is()) m_aSelectedOID = ObjectIdentifier( m_xSelectionSupplier->getSelection() ); diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx index dc51ef64e378..1e16856f9d28 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -62,7 +62,7 @@ protected: virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -71,12 +71,12 @@ protected: // ____ XModifyListener (override from CommandDispatch) ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void fireStatusEvent( const OUString & rURL, @@ -85,7 +85,7 @@ protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx index 9371233c05ea..b09c070b0229 100644 --- a/chart2/source/controller/main/UndoActions.cxx +++ b/chart2/source/controller/main/UndoActions.cxx @@ -80,7 +80,7 @@ void SAL_CALL UndoElement::disposing() m_xDocumentModel.clear(); } -OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException) +OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException, std::exception) { return m_sActionString; } @@ -95,12 +95,12 @@ void UndoElement::impl_toggleModelState() m_pModelClone = pNewClone; } -void SAL_CALL UndoElement::undo( ) throw (UndoFailedException, RuntimeException) +void SAL_CALL UndoElement::undo( ) throw (UndoFailedException, RuntimeException, std::exception) { impl_toggleModelState(); } -void SAL_CALL UndoElement::redo( ) throw (UndoFailedException, RuntimeException) +void SAL_CALL UndoElement::redo( ) throw (UndoFailedException, RuntimeException, std::exception) { impl_toggleModelState(); } @@ -118,21 +118,21 @@ ShapeUndoElement::~ShapeUndoElement() { } -OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException) +OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException, std::exception) { if ( !m_pAction ) throw DisposedException( OUString(), *this ); return m_pAction->GetComment(); } -void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException) +void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException, std::exception) { if ( !m_pAction ) throw DisposedException( OUString(), *this ); m_pAction->Undo(); } -void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException) +void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException, std::exception) { if ( !m_pAction ) throw DisposedException( OUString(), *this ); diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index 46247a97be68..542555a7f981 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -69,9 +69,9 @@ public: ); // XUndoAction - virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); @@ -97,9 +97,9 @@ public: ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ); // XUndoAction - virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 99762ff14725..09ca819723e5 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -92,7 +92,7 @@ void UndoCommandDispatch::fireStatusEvent( void SAL_CALL UndoCommandDispatch::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& /* Arguments */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_xUndoManager.is() ) { @@ -134,7 +134,7 @@ void SAL_CALL UndoCommandDispatch::disposing() // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL UndoCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xUndoManager.clear(); m_xModel.clear(); diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx index 971767e905e1..aec5d699ddc3 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -47,7 +47,7 @@ protected: virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -56,7 +56,7 @@ protected: // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void fireStatusEvent( const OUString & rURL, diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 5ab8eb9042cc..bbe887e4e053 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -95,7 +95,7 @@ protected: // ____ XPropertySet ____ /// @see ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// @see ::comphelper::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); /// @see ::comphelper::OPropertyArrayUsageHelper @@ -103,39 +103,39 @@ protected: // ____ XDataSequence ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XNumericalDataSequence ____ /// @see ::com::sun::star::chart::data::XNumericalDataSequence - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTextualDataSequence ____ /// @see ::com::sun::star::chart::data::XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception); // <properties> sal_Int32 m_nNumberFormatKey; diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 0d94e0286676..0cb4e3d5e9c8 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -62,7 +62,7 @@ public: protected: // ____ XColorScheme ____ SAL_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ConfigItemListener ____ SAL_DLLPRIVATE virtual void notify( const OUString & rPropertyName ); diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index a7a27a8bd624..799201427342 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -56,11 +56,11 @@ protected: // ____ XDataSource ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSink ____ virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Sequence< diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index d533c96110fc..d24f1208b69f 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -87,63 +87,63 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); + getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertyState virtual com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException); + throw (com::sun::star::beans::UnknownPropertyException, std::exception); virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const com::sun::star::uno::Sequence< OUString >& rPropNames ) - throw (com::sun::star::beans::UnknownPropertyException); + throw (com::sun::star::beans::UnknownPropertyException, std::exception); virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException); + throw (com::sun::star::beans::UnknownPropertyException, std::exception); virtual com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException); + throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, std::exception); protected: ErrorBar( const ErrorBar & rOther ); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSink ____ virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSource ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChild ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx index fd47f2e8518b..fc113c7afe53 100644 --- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx @@ -40,11 +40,11 @@ private: virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -54,7 +54,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); // formula is: f(x) = exp(m_fLogIntercept) * exp( m_fLogSlope * x ) // mathematical model f(x) = Intercept * Slope^x diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 2decabba8b05..284a9ba1264e 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -88,133 +88,133 @@ public: // ____ XInternalDataProvider ____ virtual ::sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getDataByRangeRepresentation( const OUString& aRange ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDataByRangeRepresentation( const OUString& aRange, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aNewData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL appendSequence() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL registerDataSequenceForChanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSeq ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataProvider (base of XInternalDataProvider) ____ virtual ::sal_Bool SAL_CALL createDataSourcePossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XRangeXMLConversion ____ virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XDateCategories ____ - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAnyDescriptionAccess ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setAnyRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setAnyColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartData (base of XChartDataArray) ____ virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual double SAL_CALL getNotANumber() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL isNotANumber( double nNumber ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception); private: void lcl_addDataSequenceToMap( diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 3cd8258b0017..f825d45ae38a 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -67,27 +67,27 @@ public: protected: // ____ XLabeledDataSequence ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getValues() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setValues( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getLabel() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xData; diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index 30313ac678cb..6696bcfa0599 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -37,7 +37,7 @@ private: sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -47,7 +47,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx index 6056b9978a85..a91d6bbc5e65 100644 --- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx @@ -40,11 +40,11 @@ private: virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -54,7 +54,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); // formula is: f(x) = m_fSlope * log( x ) + m_fIntercept double m_fSlope; diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx index 7ccfe489e011..5bafcd4254c7 100644 --- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx @@ -40,11 +40,11 @@ private: virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -54,7 +54,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); // formula is: f(x) = m_fMeanValue double m_fMeanValue; diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 31d5976140db..72627705a446 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -71,20 +71,20 @@ protected: // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WeakComponentImplHelperBase ____ virtual void SAL_CALL disposing(); diff --git a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx index d05fa25a831a..5ef6e253129d 100644 --- a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx @@ -41,11 +41,11 @@ private: virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -55,7 +55,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); std::vector<double> aYList; std::vector<double> aXList; diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 44b8a77a0c2a..3a2f748d220e 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -52,28 +52,28 @@ public: virtual ~NameContainer(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) 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& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); // XNameAccess - virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Type SAL_CALL getElementType( ) throw( com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Type SAL_CALL getElementType( ) throw( com::sun::star::uno::RuntimeException, std::exception); // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException, std::exception); private: //methods NameContainer();//no default contructor diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 10ac717ac291..33cbb8a61f81 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -129,7 +129,7 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); /** The same as getFastProperyValue, but return the value through rValue and @@ -156,67 +156,67 @@ protected: // ____ XInterface ____ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTypeProvider ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XPropertyState ____ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XMultiPropertyStates ____ // Note: getPropertyStates() is already implemented in XPropertyState with the // same signature virtual void SAL_CALL setAllPropertiesToDefault() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XStyleSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > SAL_CALL getStyle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XMultiPropertySet ____ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) - throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // ____ XFastPropertySet ____ virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // Note: it is assumed that the base class implements setPropertyValue by // using setFastPropertyValue diff --git a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx index 200463eeee5e..bf05e8a766ca 100644 --- a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx @@ -38,14 +38,14 @@ protected: virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -55,7 +55,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); std::vector<double> mCoefficients; }; diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 022263289d45..b581ca14556b 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -41,11 +41,11 @@ private: virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -55,7 +55,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); // formula is: f(x) = x ^ m_fSlope * m_fIntercept double m_fSlope; diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index 03461969c810..c036fc165211 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -57,23 +57,23 @@ public: protected: // ____ XRangeHighlighter ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XSelectionChangeListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WeakComponentImplHelperBase ____ // is called when dispose() is called at this component diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index f931a952213b..0128d4c0bc80 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -63,16 +63,16 @@ protected: sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL recalculateRegression( const com::sun::star::uno::Sequence< double >& aXValues, const com::sun::star::uno::Sequence< double >& aYValues ) - throw (com::sun::star::uno::RuntimeException) = 0; + throw (com::sun::star::uno::RuntimeException, std::exception) = 0; virtual double SAL_CALL getCurveValue( double x ) throw (com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException) = 0; + com::sun::star::uno::RuntimeException, std::exception) = 0; virtual com::sun::star::uno::Sequence< com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues( double min, @@ -82,18 +82,18 @@ protected: const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual double SAL_CALL getCorrelationCoefficient() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getRepresentation() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getFormattedRepresentation( const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >& xNumFmtSupplier, sal_Int32 nNumberFormatKey ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 2f94984ea154..3d3d6621c4bc 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -53,15 +53,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const double m_fBase; @@ -93,15 +93,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const double m_fBase; @@ -131,15 +131,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const double m_fSlope; @@ -170,15 +170,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const double m_fExponent; diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx index b317e8d99691..a71eab2815eb 100644 --- a/chart2/source/inc/ServiceMacros.hxx +++ b/chart2/source/inc/ServiceMacros.hxx @@ -36,13 +36,13 @@ namespace apphelper #define APPHELPER_XSERVICEINFO_DECL() \ virtual OUString SAL_CALL \ getImplementationName() \ - throw( ::com::sun::star::uno::RuntimeException ); \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ); \ virtual sal_Bool SAL_CALL \ supportsService( const OUString& ServiceName ) \ - throw( ::com::sun::star::uno::RuntimeException ); \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ); \ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL \ getSupportedServiceNames() \ - throw( ::com::sun::star::uno::RuntimeException ); \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ); \ \ static OUString getImplementationName_Static(); \ static ::com::sun::star::uno::Sequence< OUString > \ @@ -54,7 +54,7 @@ namespace apphelper #define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \ OUString SAL_CALL Class::getImplementationName() \ - throw( ::com::sun::star::uno::RuntimeException ) \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ) \ { \ return getImplementationName_Static(); \ } \ @@ -66,7 +66,7 @@ OUString Class::getImplementationName_Static() \ \ sal_Bool SAL_CALL \ Class::supportsService( const OUString& ServiceName ) \ - throw( ::com::sun::star::uno::RuntimeException ) \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ) \ { \ ::com::sun::star::uno::Sequence< OUString > aSNL = \ getSupportedServiceNames(); \ @@ -82,7 +82,7 @@ Class::supportsService( const OUString& ServiceName ) \ \ ::com::sun::star::uno::Sequence< OUString > SAL_CALL \ Class::getSupportedServiceNames() \ - throw( ::com::sun::star::uno::RuntimeException ) \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ) \ { \ return getSupportedServiceNames_Static(); \ } diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index c0c850739514..ba95a5d8b59f 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -95,7 +95,7 @@ protected: // ____ XPropertySet ____ /// @see ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// @see ::comphelper::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); /// @see ::comphelper::OPropertyArrayUsageHelper @@ -103,69 +103,69 @@ protected: // ____ XDataSequence ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XNumericalDataSequence ____ /// @see ::com::sun::star::chart::data::XNumericalDataSequence - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTextualDataSequence ____ /// @see ::com::sun::star::chart::data::XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XIndexReplace ____ virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XIndexAccess (base of XIndexReplace) ____ virtual ::sal_Int32 SAL_CALL getCount() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XElementAccess (base of XIndexAccess) ____ virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XNamed (for setting a new range representation) ____ virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifiable ____ virtual ::sal_Bool SAL_CALL isModified() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster (base of XModifiable) ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); void fireModifyEvent(); diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index 39eb088737ad..f2195acf7f1c 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -90,7 +90,7 @@ public: protected: // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; class WeakSelectionChangeListenerAdapter : @@ -105,7 +105,7 @@ protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 5ad89e8d7c08..6252974efec1 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -57,35 +57,35 @@ public: public: //XPropertySet - 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); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); protected: //methods /** give all the properties that should be visible to the outer side diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 0cd5a3cfc842..d4f582e7657f 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -215,7 +215,7 @@ XMLFilter::~XMLFilter() // ____ XFilter ____ sal_Bool SAL_CALL XMLFilter::filter( const Sequence< beans::PropertyValue >& aDescriptor ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -254,7 +254,7 @@ sal_Bool SAL_CALL XMLFilter::filter( } void SAL_CALL XMLFilter::cancel() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // if mutex is locked set "cancel state" // note: is currently ignored in filter-method @@ -268,7 +268,7 @@ void SAL_CALL XMLFilter::cancel() void SAL_CALL XMLFilter::setTargetDocument( const Reference< lang::XComponent >& Document ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); OSL_ENSURE( ! m_xSourceDoc.is(), "Setting target doc while source doc is set" ); @@ -280,7 +280,7 @@ void SAL_CALL XMLFilter::setTargetDocument( void SAL_CALL XMLFilter::setSourceDocument( const Reference< lang::XComponent >& Document ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); OSL_ENSURE( ! m_xTargetDoc.is(), "Setting source doc while target doc is set" ); diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx index 1a155bf6f3b7..bcdcf76540c5 100644 --- a/chart2/source/model/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx @@ -72,7 +72,7 @@ public: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// merge XInterface implementations DECLARE_XINTERFACE() @@ -82,54 +82,54 @@ public: protected: // ____ XCoordinateSystem ____ virtual ::sal_Int32 SAL_CALL getDimension() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setAxisByDimension( ::sal_Int32 nDimension, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > SAL_CALL getAxisByDimension( ::sal_Int32 nDimension, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getMaximumAxisIndexByDimension( ::sal_Int32 nDimension ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeContainer ____ virtual void SAL_CALL addChartType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& aChartType ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeChartType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& aChartType ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > > SAL_CALL getChartTypes() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setChartTypes( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aChartTypes ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index ca8f86919fba..e8c243053ac4 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -38,14 +38,14 @@ public: // ____ XCoordinateSystem ____ virtual OUString SAL_CALL getCoordinateSystemType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getViewServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceInfo ____ APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index c8cd279e31d1..2fd9541c5a9a 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -52,17 +52,17 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeManager ____ // currently empty diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 27a5ad24e81a..a4a2d4b69d82 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -94,21 +94,21 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataPointByIndex( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetDataPoint( sal_Int32 nIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetAllDataPoints() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSink ____ /// @see ::com::sun::star::chart2::data::XDataSink virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSource ____ /// @see ::com::sun::star::chart2::data::XDataSource virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -117,7 +117,7 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); @@ -125,7 +125,7 @@ protected: /// @see ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; @@ -136,43 +136,43 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve >& aRegressionCurve ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeRegressionCurve( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve >& aRegressionCurve ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > > SAL_CALL getRegressionCurves() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setRegressionCurves( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > >& aRegressionCurves ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 4a436379e4e2..4c9ade06606d 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -91,11 +91,11 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XFastPropertySet ____ virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; @@ -106,82 +106,82 @@ protected: // ____ XDiagram ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getWall() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getFloor() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XLegend > SAL_CALL getLegend() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setLegend( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XLegend >& xLegend ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme > SAL_CALL getDefaultColorScheme() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDefaultColorScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme >& xColorScheme ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDiagramData( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCoordinateSystemContainer ____ virtual void SAL_CALL addCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& aCoordSys ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& aCoordSys ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > > SAL_CALL getCoordinateSystems() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setCoordinateSystems( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > >& aCoordinateSystems ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& Title ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ X3DDefaultSetter ____ - virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index 3a498214ee53..ac6685b6ff09 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -38,14 +38,14 @@ public: // ____ XCoordinateSystem ____ virtual OUString SAL_CALL getCoordinateSystemType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getViewServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceInfo ____ APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index d63a6120fb93..6652311f3701 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -68,29 +68,29 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 648e25f45f5c..b106c7d764e6 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -73,23 +73,23 @@ protected: virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException); + 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); // ____ XImporter ____ virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Document ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XExporter ____ virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Document ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); inline OUString getDocumentHandler() const { return m_sDocumentHandler; } inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } @@ -180,7 +180,7 @@ public: protected: virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return getImplementationName_Static(); } @@ -189,7 +189,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Document ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { setDocumentHandler( "com.sun.star.comp.report.ImportDocumentHandler" ); XMLFilter::setTargetDocument(Document); @@ -200,7 +200,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Document ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { setDocumentHandler( "com.sun.star.comp.report.ExportDocumentHandler" ); XMLFilter::setSourceDocument(Document); diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index a94a7d750f38..fdc2798c25bd 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -438,7 +438,7 @@ void Axis::AllocateSubGrids() // ____ XAxis ____ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModifyEventForwarder; Reference< lang::XEventListener > xEventListener; @@ -468,27 +468,27 @@ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData ) } chart2::ScaleData SAL_CALL Axis::getScaleData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return m_aScaleData; } Reference< beans::XPropertySet > SAL_CALL Axis::getGridProperties() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return m_xGrid; } Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubGridProperties() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return m_aSubGridProperties; } Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented yet" ); return Sequence< Reference< beans::XPropertySet > >(); @@ -496,14 +496,14 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties // ____ XTitled ____ Reference< chart2::XTitle > SAL_CALL Axis::getTitleObject() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_xTitle; } void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModifyEventForwarder; Reference< chart2::XTitle > xOldTitle; @@ -524,7 +524,7 @@ void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL Axis::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Axis * pNewAxis( new Axis( *this )); // hold a reference to the clone @@ -536,7 +536,7 @@ Reference< util::XCloneable > SAL_CALL Axis::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL Axis::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -550,7 +550,7 @@ void SAL_CALL Axis::addModifyListener( const Reference< util::XModifyListener >& } void SAL_CALL Axis::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -565,14 +565,14 @@ void SAL_CALL Axis::removeModifyListener( const Reference< util::XModifyListener // ____ XModifyListener ____ void SAL_CALL Axis::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL Axis::disposing( const lang::EventObject& Source ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( Source.Source == m_aScaleData.Categories ) m_aScaleData.Categories = 0; @@ -607,7 +607,7 @@ uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticAxisInfo::get(); } diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index 7fb1d2881e62..d99e1f80acc1 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -85,56 +85,56 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAxis ____ virtual void SAL_CALL setScaleData( const ::com::sun::star::chart2::ScaleData& rScaleData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::chart2::ScaleData SAL_CALL getScaleData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getGridProperties() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > SAL_CALL getSubGridProperties() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > SAL_CALL getSubTickProperties() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& Title ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ // Note: the coordinate systems are not cloned! virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index f9a5b1f1cd15..bd4ea1233266 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -200,7 +200,7 @@ BaseCoordinateSystem::~BaseCoordinateSystem() // ____ XCoordinateSystem ____ sal_Int32 SAL_CALL BaseCoordinateSystem::getDimension() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_nDimensionCount; } @@ -210,7 +210,7 @@ void SAL_CALL BaseCoordinateSystem::setAxisByDimension( const Reference< chart2::XAxis >& xAxis, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); @@ -236,7 +236,7 @@ void SAL_CALL BaseCoordinateSystem::setAxisByDimension( Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); @@ -251,7 +251,7 @@ Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension( sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); @@ -268,7 +268,7 @@ sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int // ____ XChartTypeContainer ____ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChartType >& aChartType ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType ) != m_aChartTypes.end()) @@ -281,7 +281,7 @@ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChar void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XChartType >& aChartType ) throw (container::NoSuchElementException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::std::vector< uno::Reference< chart2::XChartType > >::iterator aIt( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType )); @@ -296,14 +296,14 @@ void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XC } Sequence< Reference< chart2::XChartType > > SAL_CALL BaseCoordinateSystem::getChartTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ContainerHelper::ContainerToSequence( m_aChartTypes ); } void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< chart2::XChartType > >& aChartTypes ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ModifyListenerHelper::removeListenerFromAllElements( m_aChartTypes, m_xModifyEventForwarder ); m_aChartTypes = ContainerHelper::SequenceToVector( aChartTypes ); @@ -313,7 +313,7 @@ void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< ch // ____ XModifyBroadcaster ____ void SAL_CALL BaseCoordinateSystem::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -327,7 +327,7 @@ void SAL_CALL BaseCoordinateSystem::addModifyListener( const Reference< util::XM } void SAL_CALL BaseCoordinateSystem::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -342,14 +342,14 @@ void SAL_CALL BaseCoordinateSystem::removeModifyListener( const Reference< util: // ____ XModifyListener ____ void SAL_CALL BaseCoordinateSystem::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL BaseCoordinateSystem::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } @@ -384,7 +384,7 @@ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL BaseCoordinateSystem::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticCooSysInfo::get(); } diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index 3fa8e294a299..b594f6c50912 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -58,20 +58,20 @@ CartesianCoordinateSystem::~CartesianCoordinateSystem() // ____ XCoordinateSystem ____ OUString SAL_CALL CartesianCoordinateSystem::getCoordinateSystemType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME; } OUString SAL_CALL CartesianCoordinateSystem::getViewServiceName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME; } // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL CartesianCoordinateSystem::createClone() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return Reference< util::XCloneable >( new CartesianCoordinateSystem( *this )); } diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 0fab4a6d3215..9e5aaaba8b27 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -197,7 +197,7 @@ ChartModel::~ChartModel() } void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { //#i113722# avoid duplicate creation @@ -328,7 +328,7 @@ uno::Sequence< OUString > ChartModel::getSupportedServiceNames_Static() sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL , const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { /* The method attachResource() is used by the frame loader implementations @@ -352,12 +352,12 @@ sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL return sal_True; } -OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException) +OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException, std::exception) { return impl_g_getLocation(); } -uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() throw(uno::RuntimeException) +uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() throw(uno::RuntimeException, std::exception) { /* The method getArgs() returns a sequence of property values @@ -374,7 +374,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() throw(uno:: } void SAL_CALL ChartModel::connectController( const uno::Reference< frame::XController >& xController ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo? this method is declared as oneway -> ...? @@ -388,7 +388,7 @@ void SAL_CALL ChartModel::connectController( const uno::Reference< frame::XContr } void SAL_CALL ChartModel::disconnectController( const uno::Reference< frame::XController >& xController ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo? this method is declared as oneway -> ...? @@ -406,7 +406,7 @@ void SAL_CALL ChartModel::disconnectController( const uno::Reference< frame::XCo DisposeHelper::DisposeAndClear( m_xRangeHighlighter ); } -void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException) +void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException, std::exception) { /* suspends some notifications to the controllers which are used for display updates. @@ -424,7 +424,7 @@ void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException) ++m_nControllerLockCount; } -void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException) +void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException, std::exception) { /* resumes the notifications which were suspended by lockControllers() . @@ -452,7 +452,7 @@ void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException) } } -sal_Bool SAL_CALL ChartModel::hasControllersLocked() throw(uno::RuntimeException) +sal_Bool SAL_CALL ChartModel::hasControllersLocked() throw(uno::RuntimeException, std::exception) { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -460,7 +460,7 @@ sal_Bool SAL_CALL ChartModel::hasControllersLocked() throw(uno::RuntimeException return ( m_nControllerLockCount != 0 ) ; } -uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController() throw(uno::RuntimeException) +uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController() throw(uno::RuntimeException, std::exception) { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -472,7 +472,7 @@ uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController() } void SAL_CALL ChartModel::setCurrentController( const uno::Reference< frame::XController >& xController ) - throw(container::NoSuchElementException, uno::RuntimeException) + throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -491,7 +491,7 @@ void SAL_CALL ChartModel::setCurrentController( const uno::Reference< frame::XCo DisposeHelper::DisposeAndClear( m_xRangeHighlighter ); } -uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() throw(uno::RuntimeException) +uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() throw(uno::RuntimeException, std::exception) { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -518,7 +518,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr } // lang::XComponent (base of XModel) -void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException) +void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException, std::exception) { Reference< XInterface > xKeepAlive( *this ); @@ -570,7 +570,7 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException) } void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed() ) return; //behave passive if already disposed or closed @@ -579,7 +579,7 @@ void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventLi } void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed @@ -590,13 +590,13 @@ void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEven // util::XCloseBroadcaster (base of XCloseable) void SAL_CALL ChartModel::addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { m_aLifeTimeManager.g_addCloseListener( xListener ); } void SAL_CALL ChartModel::removeCloseListener( const uno::Reference< util::XCloseListener > & xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed @@ -608,7 +608,7 @@ void SAL_CALL ChartModel::removeCloseListener( const uno::Reference< util::XClos // util::XCloseable void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership ) throw( util::CloseVetoException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { //hold no mutex @@ -661,7 +661,7 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership ) // lang::XTypeProvider uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XTypeProvider > xAggTypeProvider; if( (m_xOldModelAgg->queryAggregation( ::getCppuType( & xAggTypeProvider )) >>= xAggTypeProvider) @@ -683,7 +683,7 @@ uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes() // document::XDocumentPropertiesSupplier uno::Reference< document::XDocumentProperties > SAL_CALL - ChartModel::getDocumentProperties() throw (uno::RuntimeException) + ChartModel::getDocumentProperties() throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aModelMutex ); if ( !m_xDocumentProperties.is() ) @@ -694,7 +694,7 @@ uno::Reference< document::XDocumentProperties > SAL_CALL } // document::XDocumentPropertiesSupplier -Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) throw (RuntimeException) +Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aModelMutex ); if ( !m_pUndoManager.is() ) @@ -705,14 +705,14 @@ Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) thro // chart2::XChartDocument uno::Reference< chart2::XDiagram > SAL_CALL ChartModel::getFirstDiagram() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xDiagram; } void SAL_CALL ChartModel::setFirstDiagram( const uno::Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XDiagram > xOldDiagram; Reference< util::XModifyListener > xListener; @@ -772,7 +772,7 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData() } void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingData ) - throw (util::CloseVetoException, uno::RuntimeException) + throw (util::CloseVetoException, uno::RuntimeException, std::exception) { // don't lock the mutex, because this call calls out to code that tries to // lock the solar mutex. On the other hand, a paint locks the solar mutex @@ -790,13 +790,13 @@ void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingDat } sal_Bool SAL_CALL ChartModel::hasInternalDataProvider() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_xDataProvider.is() && m_xInternalDataProvider.is(); } uno::Reference< chart2::data::XDataProvider > SAL_CALL ChartModel::getDataProvider() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xDataProvider; @@ -805,7 +805,7 @@ uno::Reference< chart2::data::XDataProvider > SAL_CALL ChartModel::getDataProvid // ____ XDataReceiver ____ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data::XDataProvider >& xDataProvider ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -831,7 +831,7 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data } void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< util::XNumberFormatsSupplier >& xNewSupplier ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -862,7 +862,7 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& aArguments ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -900,19 +900,19 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& } Sequence< OUString > SAL_CALL ChartModel::getUsedRangeRepresentations() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return DataSourceHelper::getUsedDataRanges( Reference< frame::XModel >(this)); } Reference< chart2::data::XDataSource > SAL_CALL ChartModel::getUsedData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return DataSourceHelper::getUsedData( Reference< chart2::XChartDocument >(this)); } Reference< chart2::data::XRangeHighlighter > SAL_CALL ChartModel::getRangeHighlighter() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xRangeHighlighter.is()) { @@ -933,7 +933,7 @@ Reference< chart2::XChartTypeTemplate > ChartModel::impl_createDefaultChartTypeT } void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XChartTypeManager >& xNewManager ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -943,14 +943,14 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XCh } uno::Reference< chart2::XChartTypeManager > SAL_CALL ChartModel::getChartTypeManager() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xChartTypeManager; } uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getPageBackground() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xPageBackground; @@ -958,14 +958,14 @@ uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getPageBackground() // ____ XTitled ____ uno::Reference< chart2::XTitle > SAL_CALL ChartModel::getTitleObject() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xTitle; } void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle >& xTitle ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -979,7 +979,7 @@ void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle > // ____ XInterface (for old API wrapper) ____ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aResult( impl::ChartModel_Base::queryInterface( aType )); @@ -1002,7 +1002,7 @@ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType ) // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL ChartModel::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Reference< util::XCloneable >( new ChartModel( *this )); } @@ -1012,7 +1012,7 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( nAspect == embed::Aspects::MSOLE_CONTENT ) { @@ -1041,7 +1041,7 @@ awt::Size SAL_CALL ChartModel::getVisualAreaSize( ::sal_Int64 nAspect ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT, "No aspects other than content are supported" ); @@ -1055,7 +1055,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT, "No aspects other than content are supported" ); @@ -1095,7 +1095,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio ::sal_Int32 SAL_CALL ChartModel::getMapUnit( ::sal_Int64 nAspect ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT, "No aspects other than content are supported" ); @@ -1107,7 +1107,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& aFlavor ) throw (datatransfer::UnsupportedFlavorException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Any aResult; if( this->isDataFlavorSupported( aFlavor )) @@ -1138,7 +1138,7 @@ uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& a } Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< datatransfer::DataFlavor > aRet(1); @@ -1150,7 +1150,7 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors } ::sal_Bool SAL_CALL ChartModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast); } @@ -1188,7 +1188,7 @@ tServiceNameMap & lcl_getStaticServiceNameMap() } // ____ XMultiServiceFactory ____ Reference< uno::XInterface > SAL_CALL ChartModel::createInstance( const OUString& rServiceSpecifier ) - throw( uno::Exception, uno::RuntimeException ) + throw( uno::Exception, uno::RuntimeException, std::exception ) { uno::Reference< uno::XInterface > xResult; tServiceNameMap & rMap = lcl_getStaticServiceNameMap(); @@ -1244,7 +1244,7 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstance( const OUString Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments( const OUString& rServiceSpecifier , const Sequence< Any >& Arguments ) - throw( uno::Exception, uno::RuntimeException ) + throw( uno::Exception, uno::RuntimeException, std::exception ) { OSL_ENSURE( Arguments.getLength(), "createInstanceWithArguments: Warning: Arguments are ignored" ); (void)(Arguments); // avoid warning in non-debug builds @@ -1252,7 +1252,7 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments( } Sequence< OUString > SAL_CALL ChartModel::getAvailableServiceNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aResult; @@ -1285,7 +1285,7 @@ Reference< util::XNumberFormatsSupplier > ChartModel::getNumberFormatsSupplier() // ____ XUnoTunnel ___ ::sal_Int64 SAL_CALL ChartModel::getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { if( aIdentifier.getLength() == 16 && 0 == memcmp( SvNumberFormatsSupplierObj::getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) @@ -1299,7 +1299,7 @@ Reference< util::XNumberFormatsSupplier > ChartModel::getNumberFormatsSupplier() // ____ XNumberFormatsSupplier ____ uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getNumberFormatSettings() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xSupplier( getNumberFormatsSupplier() ); if( xSupplier.is() ) @@ -1308,7 +1308,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getNumberFormatSettin } uno::Reference< util::XNumberFormats > SAL_CALL ChartModel::getNumberFormats() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xSupplier( getNumberFormatsSupplier() ); if( xSupplier.is() ) @@ -1318,14 +1318,14 @@ uno::Reference< util::XNumberFormats > SAL_CALL ChartModel::getNumberFormats() // ____ XChild ____ Reference< uno::XInterface > SAL_CALL ChartModel::getParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Reference< uno::XInterface >(m_xParent,uno::UNO_QUERY); } void SAL_CALL ChartModel::setParent( const Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( Parent != m_xParent ) m_xParent.set( Parent, uno::UNO_QUERY ); @@ -1333,7 +1333,7 @@ void SAL_CALL ChartModel::setParent( const Reference< uno::XInterface >& Parent // ____ XDataSource ____ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartModel::getDataSequences() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::data::XDataSource > xSource( DataSourceHelper::getUsedData( uno::Reference< frame::XModel >(this) ) ); @@ -1345,7 +1345,7 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM //XDumper OUString SAL_CALL ChartModel::dump() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< qa::XDumper > xDumper( this->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 22e78a15f85a..4ab08f617fee 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -201,7 +201,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter( void SAL_CALL ChartModel::storeSelf( const Sequence< beans::PropertyValue >& rMediaDescriptor ) throw (lang::IllegalArgumentException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { // only some parameters are allowed (see also SfxBaseModel) // "VersionComment", "Author", "InteractionHandler", "StatusIndicator" @@ -212,20 +212,20 @@ void SAL_CALL ChartModel::storeSelf( const Sequence< beans::PropertyValue >& rMe // frame::XStorable (base of XStorable2) sal_Bool SAL_CALL ChartModel::hasLocation() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo guard return !m_aResource.isEmpty(); } OUString SAL_CALL ChartModel::getLocation() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return impl_g_getLocation(); } sal_Bool SAL_CALL ChartModel::isReadonly() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo guard return m_bReadOnly; @@ -233,7 +233,7 @@ sal_Bool SAL_CALL ChartModel::isReadonly() void SAL_CALL ChartModel::store() throw(io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall(sal_True)) //start LongLastingCall @@ -256,7 +256,7 @@ void SAL_CALL ChartModel::store() void SAL_CALL ChartModel::storeAsURL( const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw(io::IOException, uno::RuntimeException) + throw(io::IOException, uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall(sal_True)) //start LongLastingCall @@ -283,7 +283,7 @@ void SAL_CALL ChartModel::storeToURL( const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) throw(io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall(sal_True)) //start LongLastingCall @@ -386,7 +386,7 @@ void SAL_CALL ChartModel::initNew() throw (frame::DoubleInitializationException, io::IOException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { lockControllers(); createInternalDataProvider( sal_False ); @@ -492,7 +492,7 @@ void SAL_CALL ChartModel::load( throw (frame::DoubleInitializationException, io::IOException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< embed::XStorage > xStorage; OUString aURL; @@ -677,7 +677,7 @@ void SAL_CALL ChartModel::impl_notifyModifiedListeners() } sal_Bool SAL_CALL ChartModel::isModified() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo guard return m_bModified; @@ -685,7 +685,7 @@ sal_Bool SAL_CALL ChartModel::isModified() void SAL_CALL ChartModel::setModified( sal_Bool bModified ) throw(beans::PropertyVetoException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall())//@todo ? is this a long lasting call?? @@ -706,7 +706,7 @@ void SAL_CALL ChartModel::setModified( sal_Bool bModified ) // util::XModifyBroadcaster (base of XModifiable) void SAL_CALL ChartModel::addModifyListener( const uno::Reference< util::XModifyListener >& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed() ) return; //behave passive if already disposed or closed @@ -717,7 +717,7 @@ void SAL_CALL ChartModel::addModifyListener( void SAL_CALL ChartModel::removeModifyListener( const uno::Reference< util::XModifyListener >& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed @@ -728,7 +728,7 @@ void SAL_CALL ChartModel::removeModifyListener( // util::XModifyListener void SAL_CALL ChartModel::modified( const lang::EventObject& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_nInLoad == 0 ) setModified( sal_True ); @@ -736,7 +736,7 @@ void SAL_CALL ChartModel::modified( const lang::EventObject& ) // lang::XEventListener (base of util::XModifyListener) void SAL_CALL ChartModel::disposing( const lang::EventObject& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // child was disposed -- should not happen from outside } @@ -749,7 +749,7 @@ void SAL_CALL ChartModel::loadFromStorage( frame::DoubleInitializationException, io::IOException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { attachResource( OUString(), rMediaDescriptor ); impl_load( rMediaDescriptor, xStorage ); @@ -761,7 +761,7 @@ void SAL_CALL ChartModel::storeToStorage( throw (lang::IllegalArgumentException, io::IOException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { impl_store( rMediaDescriptor, xStorage ); } @@ -770,7 +770,7 @@ void SAL_CALL ChartModel::switchToStorage( const Reference< embed::XStorage >& x throw (lang::IllegalArgumentException, io::IOException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_xStorage = xStorage; impl_notifyStorageChangeListeners(); @@ -779,7 +779,7 @@ void SAL_CALL ChartModel::switchToStorage( const Reference< embed::XStorage >& x Reference< embed::XStorage > SAL_CALL ChartModel::getDocumentStorage() throw (io::IOException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return m_xStorage; } @@ -802,7 +802,7 @@ void SAL_CALL ChartModel::impl_notifyStorageChangeListeners() } void SAL_CALL ChartModel::addStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed() ) return; //behave passive if already disposed or closed @@ -812,7 +812,7 @@ void SAL_CALL ChartModel::addStorageChangeListener( const Reference< document::X } void SAL_CALL ChartModel::removeStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 5a2f6c5d8344..dd0c6d880ae1 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -151,14 +151,14 @@ DataPoint::~DataPoint() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL DataPoint::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new DataPoint( *this )); } // ____ XChild ____ Reference< uno::XInterface > SAL_CALL DataPoint::getParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Reference< uno::XInterface >( m_xParentProperties.get(), uno::UNO_QUERY ); } @@ -166,7 +166,7 @@ Reference< uno::XInterface > SAL_CALL DataPoint::getParent() void SAL_CALL DataPoint::setParent( const Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_xParentProperties = Reference< beans::XPropertySet >( Parent, uno::UNO_QUERY ); } @@ -188,7 +188,7 @@ uno::Any DataPoint::GetDefaultValue( sal_Int32 nHandle ) const void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception) + throw (uno::Exception, std::exception) { if( nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_Y || nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_X ) @@ -222,14 +222,14 @@ void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast( // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL DataPoint::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticDataPointInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL DataPoint::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -243,7 +243,7 @@ void SAL_CALL DataPoint::addModifyListener( const uno::Reference< util::XModifyL } void SAL_CALL DataPoint::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -258,14 +258,14 @@ void SAL_CALL DataPoint::removeModifyListener( const uno::Reference< util::XModi // ____ XModifyListener ____ void SAL_CALL DataPoint::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL DataPoint::disposing( const lang::EventObject& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index e339bd948624..45658afb317e 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -71,43 +71,43 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ // Note: m_xParentProperties are not cloned! virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChild ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 58c4b2e75361..d9370111658a 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -249,7 +249,7 @@ DataSeries::~DataSeries() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { DataSeries * pNewSeries( new DataSeries( *this )); // hold a reference to the clone @@ -288,7 +288,7 @@ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL DataSeries::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticDataSeriesInfo::get(); } @@ -320,7 +320,7 @@ void SAL_CALL DataSeries::getFastPropertyValue void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception) + throw (uno::Exception, std::exception) { if( nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_Y || nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_X ) @@ -350,7 +350,7 @@ void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast( Reference< beans::XPropertySet > SAL_CALL DataSeries::getDataPointByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xResult; @@ -402,7 +402,7 @@ Reference< beans::XPropertySet > } void SAL_CALL DataSeries::resetDataPoint( sal_Int32 nIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xDataPointProp; Reference< util::XModifyListener > xModifyEventForwarder; @@ -427,7 +427,7 @@ void SAL_CALL DataSeries::resetDataPoint( sal_Int32 nIndex ) } void SAL_CALL DataSeries::resetAllDataPoints() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { tDataPointAttributeContainer aOldAttributedDataPoints; Reference< util::XModifyListener > xModifyEventForwarder; @@ -443,7 +443,7 @@ void SAL_CALL DataSeries::resetAllDataPoints() // ____ XDataSink ____ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { tDataSequenceContainer aOldDataSequences; tDataSequenceContainer aNewDataSequences; @@ -466,7 +466,7 @@ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data: // ____ XDataSource ____ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries::getDataSequences() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return ContainerHelper::ContainerToSequence( m_aDataSequences ); @@ -476,7 +476,7 @@ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries: void SAL_CALL DataSeries::addRegressionCurve( const uno::Reference< chart2::XRegressionCurve >& xRegressionCurve ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModifyEventForwarder; { @@ -494,7 +494,7 @@ void SAL_CALL DataSeries::addRegressionCurve( void SAL_CALL DataSeries::removeRegressionCurve( const uno::Reference< chart2::XRegressionCurve >& xRegressionCurve ) throw (container::NoSuchElementException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( !xRegressionCurve.is() ) throw container::NoSuchElementException(); @@ -517,7 +517,7 @@ void SAL_CALL DataSeries::removeRegressionCurve( } uno::Sequence< uno::Reference< chart2::XRegressionCurve > > SAL_CALL DataSeries::getRegressionCurves() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return ContainerHelper::ContainerToSequence( m_aRegressionCurves ); @@ -525,7 +525,7 @@ uno::Sequence< uno::Reference< chart2::XRegressionCurve > > SAL_CALL DataSeries: void SAL_CALL DataSeries::setRegressionCurves( const Sequence< Reference< chart2::XRegressionCurve > >& aRegressionCurves ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { tRegressionCurveContainerType aOldCurves; tRegressionCurveContainerType aNewCurves( ContainerHelper::SequenceToVector( aRegressionCurves ) ); @@ -543,7 +543,7 @@ void SAL_CALL DataSeries::setRegressionCurves( // ____ XModifyBroadcaster ____ void SAL_CALL DataSeries::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -557,7 +557,7 @@ void SAL_CALL DataSeries::addModifyListener( const Reference< util::XModifyListe } void SAL_CALL DataSeries::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -572,14 +572,14 @@ void SAL_CALL DataSeries::removeModifyListener( const Reference< util::XModifyLi // ____ XModifyListener ____ void SAL_CALL DataSeries::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL DataSeries::disposing( const lang::EventObject& rEventObject ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // forget disposed data sequences tDataSequenceContainer::iterator aIt( diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 9de30d9b118d..6b80d367df55 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -362,7 +362,7 @@ Diagram::~Diagram() // ____ XDiagram ____ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getWall() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xRet; bool bAddListener = false; @@ -381,7 +381,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getWall() } uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getFloor() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xRet; bool bAddListener = false; @@ -400,14 +400,14 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getFloor() } uno::Reference< chart2::XLegend > SAL_CALL Diagram::getLegend() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_xLegend; } void SAL_CALL Diagram::setLegend( const uno::Reference< chart2::XLegend >& xNewLegend ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XLegend > xOldLegend; { @@ -425,7 +425,7 @@ void SAL_CALL Diagram::setLegend( const uno::Reference< chart2::XLegend >& xNewL } Reference< chart2::XColorScheme > SAL_CALL Diagram::getDefaultColorScheme() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XColorScheme > xRet; { @@ -443,7 +443,7 @@ Reference< chart2::XColorScheme > SAL_CALL Diagram::getDefaultColorScheme() } void SAL_CALL Diagram::setDefaultColorScheme( const Reference< chart2::XColorScheme >& xColorScheme ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex() ); @@ -455,7 +455,7 @@ void SAL_CALL Diagram::setDefaultColorScheme( const Reference< chart2::XColorSch void SAL_CALL Diagram::setDiagramData( const Reference< chart2::data::XDataSource >& xDataSource, const Sequence< beans::PropertyValue >& aArguments ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XMultiServiceFactory > xChartTypeManager( m_xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.chart2.ChartTypeManager", m_xContext ), uno::UNO_QUERY ); @@ -470,14 +470,14 @@ void SAL_CALL Diagram::setDiagramData( // ____ XTitled ____ uno::Reference< chart2::XTitle > SAL_CALL Diagram::getTitleObject() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_xTitle; } void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle >& xNewTitle ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XTitle > xOldTitle; { @@ -496,19 +496,19 @@ void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle >& x // ____ X3DDefaultSetter ____ void SAL_CALL Diagram::set3DSettingsToDefault() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThreeDHelper::set3DSettingsToDefault( this ); } void SAL_CALL Diagram::setDefaultRotation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThreeDHelper::setDefaultRotation( this ); } void SAL_CALL Diagram::setDefaultIllumination() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThreeDHelper::setDefaultIllumination( this ); } @@ -517,7 +517,7 @@ void SAL_CALL Diagram::setDefaultIllumination() void SAL_CALL Diagram::addCoordinateSystem( const uno::Reference< chart2::XCoordinateSystem >& aCoordSys ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex() ); @@ -539,7 +539,7 @@ void SAL_CALL Diagram::addCoordinateSystem( void SAL_CALL Diagram::removeCoordinateSystem( const uno::Reference< chart2::XCoordinateSystem >& aCoordSys ) throw (container::NoSuchElementException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex() ); @@ -556,7 +556,7 @@ void SAL_CALL Diagram::removeCoordinateSystem( } uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > SAL_CALL Diagram::getCoordinateSystems() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return ContainerHelper::ContainerToSequence( m_aCoordSystems ); @@ -565,7 +565,7 @@ uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > SAL_CALL Diagram::g void SAL_CALL Diagram::setCoordinateSystems( const Sequence< Reference< chart2::XCoordinateSystem > >& aCoordinateSystems ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { tCoordinateSystemContainerType aNew; tCoordinateSystemContainerType aOld; @@ -586,7 +586,7 @@ void SAL_CALL Diagram::setCoordinateSystems( // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL Diagram::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return Reference< util::XCloneable >( new Diagram( *this )); @@ -594,7 +594,7 @@ Reference< util::XCloneable > SAL_CALL Diagram::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL Diagram::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -608,7 +608,7 @@ void SAL_CALL Diagram::addModifyListener( const Reference< util::XModifyListener } void SAL_CALL Diagram::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -623,14 +623,14 @@ void SAL_CALL Diagram::removeModifyListener( const Reference< util::XModifyListe // ____ XModifyListener ____ void SAL_CALL Diagram::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL Diagram::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } @@ -675,7 +675,7 @@ uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL Diagram::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticDiagramInfo::get(); } @@ -685,7 +685,7 @@ void SAL_CALL Diagram::setFastPropertyValue( sal_Int32 nHandle, const Any& rValu throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { //special treatment for some 3D properties if( PROP_DIAGRAM_PERSPECTIVE == nHandle ) diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 95e4fb159128..95b709fc9d1d 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -120,21 +120,21 @@ FormattedString::~FormattedString() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new FormattedString( *this )); } // ____ XFormattedString ____ OUString SAL_CALL FormattedString::getString() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex()); return m_aString; } void SAL_CALL FormattedString::setString( const OUString& String ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex()); @@ -147,7 +147,7 @@ void SAL_CALL FormattedString::setString( const OUString& String ) // ____ XModifyBroadcaster ____ void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -161,7 +161,7 @@ void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XM } void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -176,14 +176,14 @@ void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util: // ____ XModifyListener ____ void SAL_CALL FormattedString::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL FormattedString::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } @@ -227,7 +227,7 @@ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL FormattedString::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticFormattedStringInfo::get(); } diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 28f0e9c555f6..f06b89d3e259 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -64,17 +64,17 @@ public: /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() - virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) + virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::property::OPropertySet::setPropertyValue(p1, p2); } - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { return ::property::OPropertySet::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::property::OPropertySet::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::property::OPropertySet::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::property::OPropertySet::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::property::OPropertySet::removeVetoableChangeListener(p1, p2); } protected: @@ -82,9 +82,9 @@ protected: // ____ XFormattedString ____ virtual OUString SAL_CALL getString() - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); virtual void SAL_CALL setString( const OUString& String ) - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -96,29 +96,29 @@ protected: // ____ XPropertySet ____ virtual ::css::uno::Reference< ::css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::css::uno::Reference< ::css::util::XCloneable > SAL_CALL createClone() - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::css::uno::Reference< ::css::util::XModifyListener >& aListener ) - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::css::uno::Reference< ::css::util::XModifyListener >& aListener ) - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::css::lang::EventObject& aEvent ) - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::css::lang::EventObject& Source ) - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index e73fec7528c7..f7a282440651 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -168,21 +168,21 @@ uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL GridProperties::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticGridInfo::get(); } // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL GridProperties::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new GridProperties( *this )); } // ____ XModifyBroadcaster ____ void SAL_CALL GridProperties::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -196,7 +196,7 @@ void SAL_CALL GridProperties::addModifyListener( const Reference< util::XModifyL } void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -211,14 +211,14 @@ void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModi // ____ XModifyListener ____ void SAL_CALL GridProperties::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL GridProperties::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index ce7daf0b0f39..73b3a0012ddd 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -80,29 +80,29 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index c1d5cd1c935c..01f5a1178285 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -203,14 +203,14 @@ Legend::~Legend() // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL Legend::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Reference< util::XCloneable >( new Legend( *this )); } // ____ XModifyBroadcaster ____ void SAL_CALL Legend::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -224,7 +224,7 @@ void SAL_CALL Legend::addModifyListener( const Reference< util::XModifyListener } void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -239,14 +239,14 @@ void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListen // ____ XModifyListener ____ void SAL_CALL Legend::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL Legend::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } @@ -295,7 +295,7 @@ Any Legend::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticLegendInfo::get(); } diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 9ceaae492ec4..22712c9ce285 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -80,29 +80,29 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 9f00dbbbebd0..3b72c388d67a 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -132,7 +132,7 @@ PageBackground::~PageBackground() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL PageBackground::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PageBackground( *this )); } @@ -155,14 +155,14 @@ uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL PageBackground::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticPageBackgroundInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -176,7 +176,7 @@ void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XMo } void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -191,14 +191,14 @@ void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util:: // ____ XModifyListener ____ void SAL_CALL PageBackground::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL PageBackground::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index c80af5b901f6..7070037b7f71 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -73,29 +73,29 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index 326afb3c18c7..ad11512aa343 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -58,20 +58,20 @@ PolarCoordinateSystem::~PolarCoordinateSystem() // ____ XCoordinateSystem ____ OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CHART2_COOSYSTEM_POLAR_SERVICE_NAME; } OUString SAL_CALL PolarCoordinateSystem::getViewServiceName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME; } // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL PolarCoordinateSystem::createClone() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return Reference< util::XCloneable >( new PolarCoordinateSystem( *this )); } diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 64bad2adecca..4c2044b6b8f4 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -142,7 +142,7 @@ StockBar::~StockBar() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL StockBar::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new StockBar( *this )); } @@ -165,14 +165,14 @@ uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL StockBar::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticStockBarInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -186,7 +186,7 @@ void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyLi } void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -201,14 +201,14 @@ void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModif // ____ XModifyListener ____ void SAL_CALL StockBar::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL StockBar::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 831c81cf293e..2e6b1b21091a 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -256,21 +256,21 @@ Title::~Title() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL Title::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new Title( *this )); } // ____ XTitle ____ uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL Title::getText() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_aStrings; } void SAL_CALL Title::setText( const uno::Sequence< uno::Reference< chart2::XFormattedString > >& rNewStrings ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Reference< chart2::XFormattedString > > aOldStrings; { @@ -304,14 +304,14 @@ uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL Title::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticTitleInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -325,7 +325,7 @@ void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListe } void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -340,14 +340,14 @@ void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyLi // ____ XModifyListener ____ void SAL_CALL Title::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL Title::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index 6c60490eeada..84d12923ec24 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -78,39 +78,39 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTitle ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > > SAL_CALL getText() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setText( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > >& Strings ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx index 8228be0aaa63..5916befacbdc 100644 --- a/chart2/source/model/main/UndoManager.cxx +++ b/chart2/source/model/main/UndoManager.cxx @@ -214,31 +214,31 @@ namespace chart m_pImpl->disposing(); } - void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException) + void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().enterUndoContext( i_title, aGuard ); } - void SAL_CALL UndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException) + void SAL_CALL UndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().enterHiddenUndoContext( aGuard ); } - void SAL_CALL UndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException) + void SAL_CALL UndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().leaveUndoContext( aGuard ); } - void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (IllegalArgumentException, RuntimeException) + void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (IllegalArgumentException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addUndoAction( i_action, aGuard ); } - void SAL_CALL UndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) + void SAL_CALL UndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().undo( aGuard ); @@ -246,7 +246,7 @@ namespace chart ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) ); } - void SAL_CALL UndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) + void SAL_CALL UndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().redo( aGuard ); @@ -254,110 +254,110 @@ namespace chart ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) ); } - ::sal_Bool SAL_CALL UndoManager::isUndoPossible( ) throw (RuntimeException) + ::sal_Bool SAL_CALL UndoManager::isUndoPossible( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isUndoPossible(); } - ::sal_Bool SAL_CALL UndoManager::isRedoPossible( ) throw (RuntimeException) + ::sal_Bool SAL_CALL UndoManager::isRedoPossible( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isRedoPossible(); } - OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentUndoActionTitle(); } - OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentRedoActionTitle(); } - Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllUndoActionTitles(); } - Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllRedoActionTitles(); } - void SAL_CALL UndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException) + void SAL_CALL UndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().clear( aGuard ); } - void SAL_CALL UndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException) + void SAL_CALL UndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().clearRedo( aGuard ); } - void SAL_CALL UndoManager::reset( ) throw (RuntimeException) + void SAL_CALL UndoManager::reset( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().reset( aGuard ); } - void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) + void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addUndoManagerListener( i_listener ); } - void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) + void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().removeUndoManagerListener( i_listener ); } - void SAL_CALL UndoManager::lock( ) throw (RuntimeException) + void SAL_CALL UndoManager::lock( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().lock(); } - void SAL_CALL UndoManager::unlock( ) throw (NotLockedException, RuntimeException) + void SAL_CALL UndoManager::unlock( ) throw (NotLockedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().unlock(); } - ::sal_Bool SAL_CALL UndoManager::isLocked( ) throw (RuntimeException) + ::sal_Bool SAL_CALL UndoManager::isLocked( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isLocked(); } - Reference< XInterface > SAL_CALL UndoManager::getParent( ) throw (RuntimeException) + Reference< XInterface > SAL_CALL UndoManager::getParent( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return *&m_pImpl->getParent(); } - void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException) + void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); (void)i_parent; throw NoSupportException( OUString(), m_pImpl->getThis() ); } - void SAL_CALL UndoManager::addModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException) + void SAL_CALL UndoManager::addModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addModifyListener( i_listener ); } - void SAL_CALL UndoManager::removeModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException) + void SAL_CALL UndoManager::removeModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().removeModifyListener( i_listener ); diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx index 863892120ff4..eb390e8e1b15 100644 --- a/chart2/source/model/main/UndoManager.hxx +++ b/chart2/source/model/main/UndoManager.hxx @@ -54,36 +54,36 @@ namespace chart void disposing(); // XUndoManager - virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XLockable (base of XUndoManager) - virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XChild (base of XUndoManager) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::boost::scoped_ptr< impl::UndoManager_Impl > m_pImpl; diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index 343ac5b2267e..9b76ea85a3e4 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -135,7 +135,7 @@ Wall::~Wall() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL Wall::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new Wall( *this )); } @@ -158,14 +158,14 @@ uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL Wall::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticWallInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -179,7 +179,7 @@ void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListen } void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -194,14 +194,14 @@ void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyLis // ____ XModifyListener ____ void SAL_CALL Wall::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL Wall::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index 82d074689114..a0cd1c02f088 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -71,29 +71,29 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index ef0b11485072..c739d1c3f351 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -40,14 +40,14 @@ AreaChartType::~AreaChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new AreaChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL AreaChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_AREA; } diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index bf95d0a8f068..d8f1b30358a3 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -43,11 +43,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 5a2a7d936b43..1b453e15b4a1 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -156,7 +156,7 @@ uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL AreaChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticAreaChartTypeTemplateInfo::get(); } @@ -189,14 +189,14 @@ void SAL_CALL AreaChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); } void SAL_CALL AreaChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::resetStyles( xDiagram ); ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( @@ -237,7 +237,7 @@ Reference< chart2::XChartType > AreaChartTypeTemplate::getChartTypeForIndex( sal Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index f278f4637f9f..bbcdcc6fb1f8 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -60,23 +60,23 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index 3193cf60b35a..2645c6c412c3 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -41,14 +41,14 @@ BarChartType::~BarChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL BarChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new BarChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL BarChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_BAR; } diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index a6ff4c3c0c61..e04e882aec9d 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -43,11 +43,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 29de7c7def07..8f10e3757e78 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -166,7 +166,7 @@ bool BarChartTypeTemplate::isSwapXAndY() const sal_Bool SAL_CALL BarChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -221,7 +221,7 @@ Reference< chart2::XChartType > BarChartTypeTemplate::getChartTypeForIndex( sal_ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); @@ -246,7 +246,7 @@ uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL BarChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticBarChartTypeTemplateInfo::get(); } @@ -256,7 +256,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); @@ -278,7 +278,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( void SAL_CALL BarChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::resetStyles( xDiagram ); ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx index 678faa931502..f5b0bf5da44b 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -67,28 +67,28 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index dc8302aa6de1..1b68d5b9fa4e 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -118,7 +118,7 @@ BubbleChartType::~BubbleChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL BubbleChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new BubbleChartType( *this )); } @@ -127,7 +127,7 @@ uno::Reference< util::XCloneable > SAL_CALL BubbleChartType::createClone() Reference< chart2::XCoordinateSystem > SAL_CALL BubbleChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new CartesianCoordinateSystem( @@ -158,13 +158,13 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } OUString SAL_CALL BubbleChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE; } uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aMandRolesSeq(4); aMandRolesSeq.realloc( 4 ); @@ -176,7 +176,7 @@ uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() } OUString SAL_CALL BubbleChartType::getRoleOfSequenceForSeriesLabel() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("values-size"); } @@ -200,7 +200,7 @@ uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticBubbleChartTypeInfo::get(); } diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index 71e3fd80fcdd..03de9dbd8c72 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -44,16 +44,16 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -65,11 +65,11 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 478a3fd50169..d2c907d02ff2 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -138,7 +138,7 @@ uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticBubbleChartTypeTemplateInfo::get(); } @@ -158,7 +158,7 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); @@ -166,7 +166,7 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle( // ____ XChartTypeTemplate ____ sal_Bool SAL_CALL BubbleChartTypeTemplate::supportsCategories() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return false; } @@ -192,7 +192,7 @@ Reference< chart2::XChartType > BubbleChartTypeTemplate::getChartTypeForIndex( s Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -214,7 +214,7 @@ Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeFo } Reference< chart2::XDataInterpreter > SAL_CALL BubbleChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new BubbleDataInterpreter( GetComponentContext()) ); diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx index b7f4b4994eb6..e216802bd147 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx @@ -56,24 +56,24 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL supportsCategories() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 353f59e73735..e6756a57dc6b 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -52,7 +52,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( const Reference< chart2::data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& aArguments, const Sequence< Reference< XDataSeries > >& aSeriesToReUse ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -161,7 +161,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { InterpretedData aResult( aInterpretedData ); @@ -272,7 +272,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); for( sal_Int32 i=0; i<aSeries.getLength(); ++i ) diff --git a/chart2/source/model/template/BubbleDataInterpreter.hxx b/chart2/source/model/template/BubbleDataInterpreter.hxx index 703101dee93c..b2e8be0cb114 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.hxx +++ b/chart2/source/model/template/BubbleDataInterpreter.hxx @@ -38,13 +38,13 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isDataCompatible( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index c0aa4507b30c..57320b90e3e6 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -208,20 +208,20 @@ CandleStickChartType::~CandleStickChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL CandleStickChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new CandleStickChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL CandleStickChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK; } uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { bool bShowFirst = true; bool bShowHiLow = false; @@ -246,7 +246,7 @@ uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRo } Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { bool bShowFirst = true; bool bShowHiLow = false; @@ -268,7 +268,7 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() } OUString SAL_CALL CandleStickChartType::getRoleOfSequenceForSeriesLabel() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("values-last"); } @@ -292,14 +292,14 @@ uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL CandleStickChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticCandleStickChartTypeInfo::get(); } void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception) + throw (uno::Exception, std::exception) { if( nHandle == PROP_CANDLESTICKCHARTTYPE_WHITE_DAY || nHandle == PROP_CANDLESTICKCHARTTYPE_BLACK_DAY ) diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index dca61c57f8b4..c24291023a57 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -43,15 +43,15 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -64,16 +64,16 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index 65eeff0ddadb..fa652c892677 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -75,7 +75,7 @@ Reference< uno::XComponentContext > ChartType::GetComponentContext() const Reference< chart2::XCoordinateSystem > SAL_CALL ChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new CartesianCoordinateSystem( @@ -108,7 +108,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< OUString > aDefaultSeq(2); aDefaultSeq[0] = "label"; @@ -117,13 +117,13 @@ Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles() } Sequence< OUString > SAL_CALL ChartType::getSupportedOptionalRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Sequence< OUString >(); } OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("values-y"); } @@ -142,7 +142,7 @@ void ChartType::impl_addDataSeriesWithoutNotification( // ____ XDataSeriesContainer ____ void SAL_CALL ChartType::addDataSeries( const Reference< chart2::XDataSeries >& xDataSeries ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { impl_addDataSeriesWithoutNotification( xDataSeries ); fireModifyEvent(); @@ -150,7 +150,7 @@ void SAL_CALL ChartType::addDataSeries( const Reference< chart2::XDataSeries >& void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries >& xDataSeries ) throw (container::NoSuchElementException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( !xDataSeries.is()) throw container::NoSuchElementException(); @@ -169,14 +169,14 @@ void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries } Sequence< Reference< chart2::XDataSeries > > SAL_CALL ChartType::getDataSeries() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ContainerHelper::ContainerToSequence( m_aDataSeries ); } void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XDataSeries > >& aDataSeries ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_bNotifyChanges = false; try @@ -247,14 +247,14 @@ struct StaticChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans: // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticChartTypeInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -268,7 +268,7 @@ void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyL } void SAL_CALL ChartType::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -283,14 +283,14 @@ void SAL_CALL ChartType::removeModifyListener( const uno::Reference< util::XModi // ____ XModifyListener ____ void SAL_CALL ChartType::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ChartType::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index 5dd4311761d2..f450aa3c3052 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -67,53 +67,53 @@ protected: // ____ XChartType ____ // still abstract ! implement ! virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException) = 0; + throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSeriesContainer ____ virtual void SAL_CALL addDataSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& aDataSeries ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeDataSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& aDataSeries ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > SAL_CALL getDataSeries() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDataSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aDataSeries ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); void fireModifyEvent(); @@ -128,7 +128,7 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index c945e588b775..e68744cb3474 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -233,7 +233,7 @@ ChartTypeManager::~ChartTypeManager() uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( const OUString& aServiceSpecifier ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; TemplateId nId = lcl_GetTemplateIdForService( aServiceSpecifier ); @@ -547,14 +547,14 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstanceWithA const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& /* Arguments */ ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "createInstanceWithArguments: No arguments supported" ); return createInstance( ServiceSpecifier ); } uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::std::vector< OUString > aServices; const tTemplateMapType & rMap = lcl_DefaultChartTypeMap(); diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index b06e2ef0b457..f2deb8ac5dd7 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -140,7 +140,7 @@ ChartTypeTemplate::~ChartTypeTemplate() uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource( const uno::Reference< data::XDataSource >& xDataSource, const uno::Sequence< beans::PropertyValue >& aArguments ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< XDiagram > xDia; @@ -179,13 +179,13 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource } sal_Bool SAL_CALL ChartTypeTemplate::supportsCategories() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return sal_True; } void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >& xDiagram ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! xDiagram.is()) return; @@ -263,7 +263,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData( const Reference< chart2::XDiagram >& xDiagram, const Reference< chart2::data::XDataSource >& xDataSource, const Sequence< beans::PropertyValue >& aArguments ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! (xDiagram.is() && xDataSource.is()) ) @@ -318,7 +318,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData( sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool /* bAdaptProperties */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = sal_False; @@ -371,7 +371,7 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate( } Reference< chart2::XDataInterpreter > SAL_CALL ChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new DataInterpreter( GetComponentContext() ) ); @@ -384,7 +384,7 @@ void SAL_CALL ChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 /* nSeriesIndex */, ::sal_Int32 /* nSeriesCount */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // sset stacking mode Reference< beans::XPropertySet > xSeriesProp( xSeries, uno::UNO_QUERY ); @@ -439,7 +439,7 @@ void SAL_CALL ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram } void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // reset number format if we had percent stacking on sal_Bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT); @@ -520,7 +520,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram // ____ XServiceName ____ OUString SAL_CALL ChartTypeTemplate::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_aServiceName; } diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index fc81dfd62a9c..19278a2d1426 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -90,35 +90,35 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL createDiagramByDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// denotes if the chart needs categories at the first scale virtual sal_Bool SAL_CALL supportsCategories() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL changeDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL changeDiagramData( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, ::sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // still abstract: getChartTypeForNewSeries() virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) @@ -126,7 +126,7 @@ protected: // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods to overload for automatic creation diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index cd41ea900ea2..ccc0563788de 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -140,14 +140,14 @@ ColumnChartType::~ColumnChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL ColumnChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ColumnChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL ColumnChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_COLUMN; } @@ -170,7 +170,7 @@ uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticColumnChartTypeInfo::get(); } diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 3edbd7287cbb..3a03bba568c3 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -43,7 +43,7 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -53,11 +53,11 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 9c7fd8e26452..8db0c36624b4 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -161,7 +161,7 @@ uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnLineChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticColumnLineChartTypeTemplateInfo::get(); } @@ -249,7 +249,7 @@ void SAL_CALL ColumnLineChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -280,7 +280,7 @@ StackMode ColumnLineChartTypeTemplate::getStackMode( sal_Int32 nChartTypeIndex ) sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate( const uno::Reference< XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = sal_False; @@ -377,7 +377,7 @@ Reference< chart2::XChartType > ColumnLineChartTypeTemplate::getChartTypeForInde Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -398,7 +398,7 @@ Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNew } Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) { diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx index 6c3c6344c878..e24f768e3a9c 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -60,27 +60,27 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual void createChartTypes( diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index f77dcc17fdc7..8202d8e5a796 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -55,7 +55,7 @@ InterpretedData SAL_CALL ColumnLineDataInterpreter::interpretDataSource( const Reference< data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& aArguments, const Sequence< Reference< XDataSeries > >& aSeriesToReUse ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { InterpretedData aResult( DataInterpreter::interpretDataSource( xSource, aArguments, aSeriesToReUse )); diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.hxx b/chart2/source/model/template/ColumnLineDataInterpreter.hxx index 1a04612ca167..319a1bec12fa 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx @@ -39,7 +39,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: sal_Int32 m_nNumberOfLines; diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 3e7a0c944d7f..ce454089b868 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -67,7 +67,7 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( const Reference< data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& aArguments, const Sequence< Reference< XDataSeries > >& aSeriesToReUse ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -142,7 +142,7 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { InterpretedData aResult( aInterpretedData ); @@ -199,7 +199,7 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( // criterion: all series must have exactly one data::XLabeledDataSequence sal_Bool SAL_CALL DataInterpreter::isDataCompatible( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); for( sal_Int32 i=0; i<aSeries.getLength(); ++i ) @@ -275,7 +275,7 @@ private: Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { vector< Reference< data::XLabeledDataSequence > > aResultVec; aResultVec.reserve( aInterpretedData.Series.getLength() + diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index 761e0f587e2e..84776c21a9e1 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -75,16 +75,16 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isDataCompatible( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL mergeInterpretedData( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 4a71becbcaa3..1b8381c87c46 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -55,14 +55,14 @@ FilledNetChartType::~FilledNetChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL FilledNetChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new FilledNetChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL FilledNetChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET; } diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 021d7f2f9ad9..2bd4ade19cd4 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -42,11 +42,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index dcb83a36c36a..7733ed5467a0 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -152,14 +152,14 @@ LineChartType::~LineChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL LineChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LineChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL LineChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_LINE; } @@ -182,7 +182,7 @@ uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticLineChartTypeInfo::get(); } diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index 4b0b1c49b6da..e0db220f1e91 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -44,7 +44,7 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -54,11 +54,11 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 22838c4d2189..5d833df72297 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -183,7 +183,7 @@ uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticLineChartTypeTemplateInfo::get(); } @@ -202,7 +202,7 @@ StackMode LineChartTypeTemplate::getStackMode( sal_Int32 /* nChartTypeIndex */ ) sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( const uno::Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -320,7 +320,7 @@ Reference< chart2::XChartType > LineChartTypeTemplate::getChartTypeForIndex( sal Reference< chart2::XChartType > SAL_CALL LineChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -357,7 +357,7 @@ void SAL_CALL LineChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx index 570809d35306..43dd77eae7a1 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -62,25 +62,25 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index 8672c837b8fa..deef738a1ec1 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -57,7 +57,7 @@ NetChartType_Base::~NetChartType_Base() Reference< XCoordinateSystem > SAL_CALL NetChartType_Base::createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( DimensionCount != 2 ) throw lang::IllegalArgumentException( @@ -139,7 +139,7 @@ struct StaticNetChartTypeInfo : public rtl::StaticAggregate< uno::Reference< bea // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL NetChartType_Base::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticNetChartTypeInfo::get(); } @@ -159,14 +159,14 @@ NetChartType::~NetChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL NetChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new NetChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL NetChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_NET; } diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index 189ac094b2bf..123f78217d61 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -39,7 +39,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -50,7 +50,7 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; class NetChartType : public NetChartType_Base @@ -70,11 +70,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 9718c42877ae..0695c8846aaf 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -69,7 +69,7 @@ void SAL_CALL NetChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -91,7 +91,7 @@ void SAL_CALL NetChartTypeTemplate::applyStyle( sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -192,7 +192,7 @@ Reference< chart2::XChartType > NetChartTypeTemplate::getChartTypeForIndex( sal_ Reference< chart2::XChartType > SAL_CALL NetChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index b8b3687fb25f..48462140950c 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -47,18 +47,18 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 99d01bc8e938..8fdd25d559c2 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -145,14 +145,14 @@ PieChartType::~PieChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL PieChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PieChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL PieChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_PIE; } @@ -160,7 +160,7 @@ OUString SAL_CALL PieChartType::getChartType() Reference< chart2::XCoordinateSystem > SAL_CALL PieChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new PolarCoordinateSystem( @@ -214,7 +214,7 @@ uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticPieChartTypeInfo::get(); } diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index 60e563f4c7e1..aefd34cbaed9 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -44,11 +44,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -60,11 +60,11 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index c1f05ccc006a..d25d283774fd 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -191,7 +191,7 @@ uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticPieChartTypeTemplateInfo::get(); } @@ -311,7 +311,7 @@ void PieChartTypeTemplate::createChartTypes( sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate( const uno::Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -422,7 +422,7 @@ Reference< chart2::XChartType > PieChartTypeTemplate::getChartTypeForIndex( sal_ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -454,7 +454,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -541,7 +541,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( } void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // reset axes and grids Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY ); diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx index 9e4bebd2ce7a..b5fd2113f24a 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -61,28 +61,28 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual sal_Int32 getDimension() const; diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index b15c067572f9..2a569bbf5b30 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -168,7 +168,7 @@ ScatterChartType::~ScatterChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ScatterChartType( *this )); } @@ -177,7 +177,7 @@ uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone() Reference< chart2::XCoordinateSystem > SAL_CALL ScatterChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new CartesianCoordinateSystem( @@ -208,13 +208,13 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } OUString SAL_CALL ScatterChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_SCATTER; } uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aMandRolesSeq(3); aMandRolesSeq[0] = "label"; @@ -224,7 +224,7 @@ uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles( } uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Sequence< OUString >(); } @@ -248,7 +248,7 @@ uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticScatterChartTypeInfo::get(); } diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 25d3001bf76d..9f28410d0761 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -48,17 +48,17 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -70,11 +70,11 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index cd68e7ed9878..2312ae89bded 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -184,7 +184,7 @@ uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticScatterChartTypeTemplateInfo::get(); } @@ -206,7 +206,7 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -228,7 +228,7 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle( // ____ XChartTypeTemplate ____ sal_Bool SAL_CALL ScatterChartTypeTemplate::supportsCategories() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return sal_False; } @@ -236,7 +236,7 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::supportsCategories() sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -354,7 +354,7 @@ Reference< chart2::XChartType > ScatterChartTypeTemplate::getChartTypeForIndex( Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -387,7 +387,7 @@ Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeF } Reference< chart2::XDataInterpreter > SAL_CALL ScatterChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new XYDataInterpreter( GetComponentContext()) ); diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index 07d766e2a224..08f52443649b 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -60,29 +60,29 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL supportsCategories() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 342bcfcecc87..d1d0b898ac52 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -199,7 +199,7 @@ uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL StockChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticStockChartTypeTemplateInfo::get(); } @@ -225,7 +225,7 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); try @@ -270,7 +270,7 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( void SAL_CALL StockChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::resetStyles( xDiagram ); if( getDimension() == 3 ) @@ -408,7 +408,7 @@ void StockChartTypeTemplate::createChartTypes( sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( const uno::Reference< XDiagram >& xDiagram, sal_Bool /* bAdaptProperties */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = sal_False; @@ -489,7 +489,7 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -510,7 +510,7 @@ Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSerie } Reference< XDataInterpreter > SAL_CALL StockChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new StockDataInterpreter( m_eStockVariant, GetComponentContext() ) ); diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index 2d01d58ab85b..582413b61278 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -74,30 +74,30 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ChartTypeTemplate virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension ); diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index e0714857117d..a425a8583f19 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -62,7 +62,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( const Reference< data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& rArguments, const Sequence< Reference< XDataSeries > >& rSeriesToReUse ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -263,7 +263,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( // volume to one with volume) sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // high/low/close sal_Int32 nNumberOfNecessarySequences = 3; @@ -320,7 +320,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( InterpretedData SAL_CALL StockDataInterpreter::reinterpretDataSeries( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // prerequisite: StockDataInterpreter::isDataCompatible() returned true return aInterpretedData; diff --git a/chart2/source/model/template/StockDataInterpreter.hxx b/chart2/source/model/template/StockDataInterpreter.hxx index 5e2b1f3c6fa1..b33235586b5d 100644 --- a/chart2/source/model/template/StockDataInterpreter.hxx +++ b/chart2/source/model/template/StockDataInterpreter.hxx @@ -41,13 +41,13 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isDataCompatible( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: StockChartTypeTemplate::StockVariant m_eStockVariant; diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index ebf9979ad40b..8bf2b03a9aaf 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -52,7 +52,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( const Reference< chart2::data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& aArguments, const Sequence< Reference< XDataSeries > >& aSeriesToReUse ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -145,7 +145,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { InterpretedData aResult( aInterpretedData ); @@ -234,7 +234,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( // criterion: all series must have exactly two data::XLabeledDataSequences sal_Bool SAL_CALL XYDataInterpreter::isDataCompatible( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); for( sal_Int32 i=0; i<aSeries.getLength(); ++i ) diff --git a/chart2/source/model/template/XYDataInterpreter.hxx b/chart2/source/model/template/XYDataInterpreter.hxx index 4b1355c916fe..7cd698945a38 100644 --- a/chart2/source/model/template/XYDataInterpreter.hxx +++ b/chart2/source/model/template/XYDataInterpreter.hxx @@ -38,13 +38,13 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isDataCompatible( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 406606c5256d..13ce0b899ff5 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -238,7 +238,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( CachedDataSequence, CachedDataSequence_Base, O // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySetInfo() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } @@ -264,7 +264,7 @@ APPHELPER_XSERVICEINFO_IMPL( CachedDataSequence, lcl_aServiceName ) // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -276,7 +276,7 @@ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() // ________ XTextualDataSequence ________ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -288,20 +288,20 @@ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData() // ________ XDataSequence ________ Sequence< Any > SAL_CALL CachedDataSequence::getData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return Impl_getMixedData(); } OUString SAL_CALL CachedDataSequence::getSourceRangeRepresentation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_sRole; } Sequence< OUString > SAL_CALL CachedDataSequence::generateLabel( chart2::data::LabelOrigin /*eLabelOrigin*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // return empty label, as we have no range representaions to determine something useful return Sequence< OUString >(); @@ -309,13 +309,13 @@ Sequence< OUString > SAL_CALL CachedDataSequence::generateLabel( chart2::data::L ::sal_Int32 SAL_CALL CachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 /*nIndex*/ ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return 0; } Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { CachedDataSequence * pNewSeq = new CachedDataSequence( *this ); @@ -323,7 +323,7 @@ Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone() } void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -337,7 +337,7 @@ void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XMod } void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -351,7 +351,7 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X } // lang::XInitialization: -void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception) +void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) { ::comphelper::SequenceAsHashMap aMap(_aArguments); m_aNumericalSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aNumericalSequence); diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index df8d4fe19ae4..821f06923a52 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -143,7 +143,7 @@ void ConfigColorScheme::retrieveConfigColors() // ____ XColorScheme ____ ::sal_Int32 SAL_CALL ConfigColorScheme::getColorByIndex( ::sal_Int32 nIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_bNeedsUpdate ) retrieveConfigColors(); diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 505c5335cebd..f81571142c31 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -50,14 +50,14 @@ DataSource::~DataSource() // ____ XDataSource ____ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSource::getDataSequences() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_aDataSeq; } // ____ XDataSink ____ void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aDataSeq = aData; } diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index d5c90e88d773..1469e8e5774d 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -127,14 +127,14 @@ ErrorBar::~ErrorBar() {} uno::Reference< util::XCloneable > SAL_CALL ErrorBar::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ErrorBar( *this )); } // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ErrorBar::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > aRef ( new SfxItemPropertySetInfo( GetErrorBarPropertySet()->getPropertyMap() ) ); @@ -143,7 +143,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ErrorBar::getPropertySetInfo( void ErrorBar::setPropertyValue( const OUString& rPropName, const uno::Any& rAny ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -216,7 +216,7 @@ OUString getSourceRangeStrFromLabeledSequences( uno::Sequence< uno::Reference< c } uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -269,7 +269,7 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) } beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException) + throw (com::sun::star::beans::UnknownPropertyException, std::exception) { if(rPropName == "ErrorBarStyle") { @@ -340,7 +340,7 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) } uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Sequence< OUString >& rPropNames ) - throw (com::sun::star::beans::UnknownPropertyException) + throw (com::sun::star::beans::UnknownPropertyException, std::exception) { uno::Sequence< beans::PropertyState > aRet( rPropNames.getLength() ); for(sal_Int32 i = 0; i < rPropNames.getLength(); ++i) @@ -351,41 +351,41 @@ uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Se } void ErrorBar::setPropertyToDefault( const OUString& ) - throw (beans::UnknownPropertyException) + throw (beans::UnknownPropertyException, std::exception) { //keep them unimplemented for now } uno::Any ErrorBar::getPropertyDefault( const OUString& ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, std::exception) { //keep them unimplemented for now return uno::Any(); } void ErrorBar::addPropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } void ErrorBar::removePropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } void ErrorBar::addVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } void ErrorBar::removeVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } // ____ XModifyBroadcaster ____ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -399,7 +399,7 @@ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyLi } void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -414,21 +414,21 @@ void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModif // ____ XModifyListener ____ void SAL_CALL ErrorBar::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ErrorBar::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } // ____ XDataSink ____ void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ModifyListenerHelper::removeListenerFromAllElements( m_aDataSequences, m_xModifyEventForwarder ); EventListenerHelper::removeListenerFromAllElements( m_aDataSequences, this ); @@ -439,7 +439,7 @@ void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::da // ____ XDataSource ____ uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ErrorBar::getDataSequences() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ContainerHelper::ContainerToSequence( m_aDataSequences ); } diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index 876067587211..6cb949044733 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -44,7 +44,7 @@ ExponentialRegressionCurveCalculator::~ExponentialRegressionCurveCalculator() void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -91,7 +91,7 @@ void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression( double SAL_CALL ExponentialRegressionCurveCalculator::getCurveValue( double x ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -111,7 +111,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL ExponentialRegressionCurveCalcul const uno::Reference< chart2::XScaling >& xScalingY, ::sal_Bool bMaySkipPointsInCalculation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLinearScaling( xScalingX ) && diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index fe70d7c59066..e2874961da1c 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -585,7 +585,7 @@ void InternalDataProvider::createDefaultData() // ____ XDataProvider ____ ::sal_Bool SAL_CALL InternalDataProvider::createDataSourcePossible( const Sequence< beans::PropertyValue >& /* aArguments */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return true; } @@ -611,7 +611,7 @@ sal_Int32 lcl_getInnerLevelCount( const vector< vector< uno::Any > >& rLabels ) Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createDataSource( const Sequence< beans::PropertyValue >& aArguments ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OUString aRangeRepresentation; bool bUseColumns = true; @@ -701,7 +701,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( const Reference< chart2::data::XDataSource >& /* xDataSource */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< beans::PropertyValue > aArguments( 4 ); aArguments[0] = beans::PropertyValue( @@ -726,7 +726,7 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( } ::sal_Bool SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& /* aRangeRepresentation */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return true; } @@ -734,7 +734,7 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( aRangeRepresentation.match( lcl_aCategoriesRangeName )) { @@ -766,7 +766,7 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa } Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelection() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // there is no range selection component return Reference< sheet::XRangeSelection >(); @@ -774,7 +774,7 @@ Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelec // ____ XInternalDataProvider ____ ::sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUString& aRange ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = false; @@ -798,7 +798,7 @@ Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelec } Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation( const OUString& aRange ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< uno::Any > aResult; @@ -872,7 +872,7 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( const OUString& aRange, const Sequence< uno::Any >& aNewData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { vector< uno::Any > aNewVector( ContainerHelper::SequenceToVector(aNewData) ); if( aRange.match( lcl_aLabelRangePrefix ) ) @@ -938,7 +938,7 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( } void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) { @@ -953,7 +953,7 @@ void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex ) } void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { lcl_deleteMapReferences( OUString::number( nAtIndex )); lcl_deleteMapReferences( lcl_aLabelRangePrefix + OUString::number( nAtIndex )); @@ -970,7 +970,7 @@ void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex ) } void SAL_CALL InternalDataProvider::appendSequence() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) m_aInternalData.appendColumn(); @@ -979,7 +979,7 @@ void SAL_CALL InternalDataProvider::appendSequence() } void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_ENSURE( nLevel> 0, "you can only insert category levels > 0" );//the first categories level cannot be deleted, check the calling code for error if( nLevel>0 ) @@ -996,7 +996,7 @@ void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel } } void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_ENSURE( nLevel>0, "you can only delete category levels > 0" );//the first categories level cannot be deleted, check the calling code for error if( nLevel>0 ) @@ -1014,7 +1014,7 @@ void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel } void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Int32 nMaxRep = 0; if( m_bDataInColumns ) @@ -1038,7 +1038,7 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 } void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Int32 nMaxRep = 0; if( m_bDataInColumns ) @@ -1062,7 +1062,7 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 } void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) m_aInternalData.swapRowWithNext( nAtIndex ); @@ -1082,7 +1082,7 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s } void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Reference< chart2::data::XDataSequence >& xSeq ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( xSeq.is()) lcl_addDataSequenceToMap( xSeq->getSourceRangeRepresentation(), xSeq ); @@ -1091,7 +1091,7 @@ void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Refere // ____ XRangeXMLConversion ____ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRangeRepresentation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { XMLRangeHelper::CellRange aRange; aRange.aTableName = "local-table"; @@ -1169,7 +1169,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXMLRange ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { XMLRangeHelper::CellRange aRange( XMLRangeHelper::getCellRangeFromXMLString( aXMLRange )); if( aRange.aUpperLeft.bIsEmpty ) @@ -1298,7 +1298,7 @@ uno::Sequence< OUString > SplitCategoriesProvider_ForComplexDescriptions::getStr }//anonymous namespace // ____ XDateCategories ____ -Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno::RuntimeException) +Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno::RuntimeException, std::exception) { double fNan = InternalDataProvider::getNotANumber(); double fValue = fNan; @@ -1316,7 +1316,7 @@ Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno return aDoubles; } -void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception) { sal_Int32 nCount = rDates.getLength(); vector< vector< uno::Any > > aNewCategories; @@ -1336,56 +1336,56 @@ void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& } // ____ XAnyDescriptionAccess ____ -Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception) { return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexRowLabels() ); } -void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception) { m_aInternalData.setComplexRowLabels( lcl_convertSequenceSequenceToVectorVector( aRowDescriptions ) ); } -Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception) { return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexColumnLabels() ); } -void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception) { m_aInternalData.setComplexColumnLabels( lcl_convertSequenceSequenceToVectorVector( aColumnDescriptions ) ); } // ____ XComplexDescriptionAccess ____ -Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception) { return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexRowLabels() ); } -void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception) { m_aInternalData.setComplexRowLabels( lcl_convertComplexStringSequenceToAnyVector(aRowDescriptions) ); } -Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception) { return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexColumnLabels() ); } -void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception) { m_aInternalData.setComplexColumnLabels( lcl_convertComplexStringSequenceToAnyVector(aColumnDescriptions) ); } // ____ XChartDataArray ____ Sequence< Sequence< double > > SAL_CALL InternalDataProvider::getData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_aInternalData.getData(); } void SAL_CALL InternalDataProvider::setData( const Sequence< Sequence< double > >& rDataInRows ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_aInternalData.setData( rDataInRows ); } void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString >& aRowDescriptions ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexDescriptions( aRowDescriptions.getLength() ); transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aRowDescriptions.getConstArray(), @@ -1394,7 +1394,7 @@ void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString } void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUString >& aColumnDescriptions ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexDescriptions( aColumnDescriptions.getLength() ); transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aColumnDescriptions.getConstArray(), @@ -1403,7 +1403,7 @@ void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUStr } Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexRowLabels() ); SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels ); @@ -1411,7 +1411,7 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions() } Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexColumnLabels() ); SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels ); @@ -1421,18 +1421,18 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions() // ____ XChartData (base of XChartDataArray) ____ void SAL_CALL InternalDataProvider::addChartDataChangeEventListener( const Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL InternalDataProvider::removeChartDataChangeEventListener( const Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } double SAL_CALL InternalDataProvider::getNotANumber() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fNan; ::rtl::math::setNan( & fNan ); @@ -1440,13 +1440,13 @@ double SAL_CALL InternalDataProvider::getNotANumber() } ::sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ::rtl::math::isNan( nNumber ) || ::rtl::math::isInf( nNumber ); } // lang::XInitialization: -void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception) +void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) { comphelper::SequenceAsHashMap aArgs(_aArguments); if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData" ,sal_False) ) @@ -1454,7 +1454,7 @@ void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & } // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Reference< util::XCloneable >( new InternalDataProvider( *this )); } diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index 68df3c83520c..84609b9c2cb7 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -66,14 +66,14 @@ LabeledDataSequence::~LabeledDataSequence() // ____ XLabeledDataSequence ____ uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getValues() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_xData; } void SAL_CALL LabeledDataSequence::setValues( const uno::Reference< chart2::data::XDataSequence >& xSequence ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_xData != xSequence ) { @@ -84,14 +84,14 @@ void SAL_CALL LabeledDataSequence::setValues( } uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getLabel() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_xLabel; } void SAL_CALL LabeledDataSequence::setLabel( const uno::Reference< chart2::data::XDataSequence >& xSequence ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_xLabel != xSequence ) { @@ -103,7 +103,7 @@ void SAL_CALL LabeledDataSequence::setLabel( // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< chart2::data::XDataSequence > xNewValues( m_xData ); uno::Reference< chart2::data::XDataSequence > xNewLabel( m_xLabel ); @@ -122,7 +122,7 @@ uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -136,7 +136,7 @@ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XMo } void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index ec328926ce8b..7ed0c00ef765 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -41,7 +41,7 @@ void LinearRegressionCurveCalculator::setRegressionProperties( sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { PolynomialRegressionCurveCalculator::setRegressionProperties( 1, @@ -56,7 +56,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LinearRegressionCurveCalculator: const uno::Reference< chart2::XScaling >& xScalingY, ::sal_Bool bMaySkipPointsInCalculation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLinearScaling( xScalingX ) && diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index 58e92a1e3330..a00a0cdde976 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -44,7 +44,7 @@ LogarithmicRegressionCurveCalculator::~LogarithmicRegressionCurveCalculator() void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -90,7 +90,7 @@ void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression( double SAL_CALL LogarithmicRegressionCurveCalculator::getCurveValue( double x ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -110,7 +110,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LogarithmicRegressionCurveCalcul const uno::Reference< chart2::XScaling >& xScalingY, ::sal_Bool bMaySkipPointsInCalculation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLogarithmicScaling( xScalingX ) && diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index e94861456e05..c263d48b2770 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -41,7 +41,7 @@ MeanValueRegressionCurveCalculator::~MeanValueRegressionCurveCalculator() void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& /*aXValues*/, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const sal_Int32 nDataLength = aYValues.getLength(); sal_Int32 nMax = nDataLength; @@ -88,7 +88,7 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression( double SAL_CALL MeanValueRegressionCurveCalculator::getCurveValue( double /*x*/ ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return m_fMeanValue; } @@ -99,7 +99,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MeanValueRegressionCurveCalculat const uno::Reference< chart2::XScaling >& xScalingY, ::sal_Bool bMaySkipPointsInCalculation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation ) { diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx index 15834b891522..3dcd37a05faa 100644 --- a/chart2/source/tools/ModifyListenerCallBack.cxx +++ b/chart2/source/tools/ModifyListenerCallBack.cxx @@ -42,10 +42,10 @@ public: void stopListening(); //XModifyListener - virtual void SAL_CALL modified( const lang::EventObject& aEvent ) throw (uno::RuntimeException); + virtual void SAL_CALL modified( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception); //XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException); + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception); using ::cppu::WeakComponentImplHelperBase::disposing; @@ -66,13 +66,13 @@ ModifyListenerCallBack_impl::~ModifyListenerCallBack_impl() } //XModifyListener -void SAL_CALL ModifyListenerCallBack_impl::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException) +void SAL_CALL ModifyListenerCallBack_impl::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException, std::exception) { m_aLink.Call(0); } //XEventListener -void SAL_CALL ModifyListenerCallBack_impl::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) +void SAL_CALL ModifyListenerCallBack_impl::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) { m_xBroadcaster.clear(); } diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 36c62ee7f9ff..3245ca527c1a 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -163,27 +163,27 @@ void ModifyEventForwarder::DisposeAndClear( const Reference< uno::XWeak > & xSou // ____ XModifyBroadcaster ____ void SAL_CALL ModifyEventForwarder::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { AddListener( aListener ); } void SAL_CALL ModifyEventForwarder::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { RemoveListener( aListener ); } // ____ XModifyListener ____ void SAL_CALL ModifyEventForwarder::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { FireEvent( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ModifyEventForwarder::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx index 55193f11b210..ee61c9c7cd9a 100644 --- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx @@ -41,7 +41,7 @@ MovingAverageRegressionCurveCalculator::~MovingAverageRegressionCurveCalculator( void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::rtl::math::setNan( & m_fCorrelationCoeffitient ); @@ -74,7 +74,7 @@ void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression( double SAL_CALL MovingAverageRegressionCurveCalculator::getCurveValue( double /*x*/ ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { double fResult; rtl::math::setNan(&fResult); @@ -87,7 +87,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MovingAverageRegressionCurveCalc const uno::Reference< chart2::XScaling >& /*xScalingY*/, sal_Bool /*bMaySkipPointsInCalculation*/ ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Sequence< geometry::RealPoint2D > aResult( aYList.size() ); diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx index c7b7507b729e..8961dd7b51df 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -59,19 +59,19 @@ NameContainer::~NameContainer() //XServiceInfo OUString SAL_CALL NameContainer::getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return m_aImplementationName; } sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = m_aServicename; @@ -80,7 +80,7 @@ Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() // XNameContainer void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if( m_aMap.find( rName ) != m_aMap.end() ) throw container::ElementExistException(); @@ -88,7 +88,7 @@ void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rEl } void SAL_CALL NameContainer::removeByName( const OUString& Name ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { tContentMap::iterator aIt( m_aMap.find( Name )); if( aIt == m_aMap.end()) @@ -98,7 +98,7 @@ void SAL_CALL NameContainer::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL NameContainer::replaceByName( const OUString& rName, const Any& rElement ) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { tContentMap::iterator aIt( m_aMap.find( rName )); if( aIt == m_aMap.end() ) @@ -108,7 +108,7 @@ void SAL_CALL NameContainer::replaceByName( const OUString& rName, const Any& rE // XNameAccess Any SAL_CALL NameContainer::getByName( const OUString& rName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { tContentMap::iterator aIter( m_aMap.find( rName ) ); if( aIter == m_aMap.end() ) @@ -117,7 +117,7 @@ Any SAL_CALL NameContainer::getByName( const OUString& rName ) } Sequence< OUString > SAL_CALL NameContainer::getElementNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { sal_Int32 nCount = m_aMap.size(); Sequence< OUString > aSeq(nCount); @@ -128,27 +128,27 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames() } sal_Bool SAL_CALL NameContainer::hasByName( const OUString& rName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return ( m_aMap.find( rName ) != m_aMap.end() ); } // XElementAccess sal_Bool SAL_CALL NameContainer::hasElements() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return ! m_aMap.empty(); } uno::Type SAL_CALL NameContainer::getElementType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aType; } // XCloneable uno::Reference< util::XCloneable > SAL_CALL NameContainer::createClone() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return uno::Reference< util::XCloneable >( new NameContainer( *this )); } diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index db4efffd5057..304e101b5514 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -79,7 +79,7 @@ void OPropertySet::disposePropertySet() } Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ::cppu::queryInterface( aType, @@ -97,7 +97,7 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType ) // // ____ XTypeProvider ____ Sequence< uno::Type > SAL_CALL OPropertySet::getTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { static Sequence< uno::Type > aTypeList; @@ -128,7 +128,7 @@ namespace Sequence< sal_Int8 > SAL_CALL OPropertySet::getImplementationId() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theOPropertySetImplementationId::get().getSeq(); } @@ -137,7 +137,7 @@ Sequence< sal_Int8 > SAL_CALL beans::PropertyState SAL_CALL OPropertySet::getPropertyState( const OUString& PropertyName ) throw (beans::UnknownPropertyException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -148,7 +148,7 @@ beans::PropertyState SAL_CALL Sequence< beans::PropertyState > SAL_CALL OPropertySet::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw (beans::UnknownPropertyException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -164,7 +164,7 @@ Sequence< beans::PropertyState > SAL_CALL void SAL_CALL OPropertySet::setPropertyToDefault( const OUString& PropertyName ) throw (beans::UnknownPropertyException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -176,7 +176,7 @@ Any SAL_CALL OPropertySet::getPropertyDefault( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -190,7 +190,7 @@ Any SAL_CALL void SAL_CALL OPropertySet::setAllPropertiesToDefault() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_pImplProperties->SetAllPropertiesToDefault(); firePropertyChangeEvent(); @@ -199,7 +199,7 @@ void SAL_CALL void SAL_CALL OPropertySet::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -216,7 +216,7 @@ Sequence< Any > SAL_CALL OPropertySet::getPropertyDefaults( const Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::cppu::IPropertyArrayHelper & rPH = getInfoHelper(); const sal_Int32 nElements = aPropertyNames.getLength(); @@ -271,7 +271,7 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const Any& rValue ) - throw (uno::Exception) + throw (uno::Exception, std::exception) { #if OSL_DEBUG_LEVEL > 0 if( rValue.hasValue()) @@ -385,14 +385,14 @@ void OPropertySet::firePropertyChangeEvent() // ____ XStyleSupplier ____ Reference< style::XStyle > SAL_CALL OPropertySet::getStyle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_pImplProperties->GetStyle(); } void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( ! m_pImplProperties->SetStyle( xStyle )) throw lang::IllegalArgumentException( @@ -407,7 +407,7 @@ void SAL_CALL OPropertySet::setPropertyValues( throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::cppu::OPropertySetHelper::setPropertyValues( PropertyNames, Values ); @@ -419,7 +419,7 @@ void SAL_CALL OPropertySet::setFastPropertyValue( sal_Int32 nHandle, const Any& throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::cppu::OPropertySetHelper::setFastPropertyValue( nHandle, rValue ); diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx index 21b564d63d08..90be5a163af5 100644 --- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx @@ -40,7 +40,7 @@ PolynomialRegressionCurveCalculator::~PolynomialRegressionCurveCalculator() void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { rtl::math::setNan(&m_fCorrelationCoeffitient); @@ -200,7 +200,7 @@ void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression( double SAL_CALL PolynomialRegressionCurveCalculator::getCurveValue( double x ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { double fResult; rtl::math::setNan(&fResult); @@ -227,7 +227,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL PolynomialRegressionCurveCalcula const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return RegressionCurveCalculator::getCurveValues( min, max, nPointCount, xScalingX, xScalingY, bMaySkipPointsInCalculation ); diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index 0d0898008fbf..0489eeaba995 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -44,7 +44,7 @@ PotentialRegressionCurveCalculator::~PotentialRegressionCurveCalculator() void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -92,7 +92,7 @@ void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression( double SAL_CALL PotentialRegressionCurveCalculator::getCurveValue( double x ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -112,7 +112,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL PotentialRegressionCurveCalculat const uno::Reference< chart2::XScaling >& xScalingY, ::sal_Bool bMaySkipPointsInCalculation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLogarithmicScaling( xScalingX ) && diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index bbe879f77ca5..6a865a175cec 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -75,7 +75,7 @@ RangeHighlighter::~RangeHighlighter() // ____ XRangeHighlighter ____ Sequence< chart2::data::HighlightedRange > SAL_CALL RangeHighlighter::getSelectedRanges() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_aSelectedRanges; } @@ -298,7 +298,7 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface } void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if(!xListener.is()) return; @@ -314,7 +314,7 @@ void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< vie } void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { rBHelper.removeListener( ::getCppuType( & xListener ), xListener ); --m_nAddedListenerCount; @@ -324,7 +324,7 @@ void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< // ____ XSelectionChangeListener ____ void SAL_CALL RangeHighlighter::selectionChanged( const lang::EventObject& /*aEvent*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { determineRanges(); @@ -351,7 +351,7 @@ void RangeHighlighter::fireSelectionEvent() } void SAL_CALL RangeHighlighter::disposing( const lang::EventObject& Source ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( Source.Source == m_xSelectionSupplier ) { diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index d05fd44d6bfc..694e056e6b9f 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -73,7 +73,7 @@ void RegressionCurveCalculator::setRegressionProperties( sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { mDegree = aDegree; mForceIntercept = aForceIntercept; @@ -101,7 +101,7 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa const Reference< chart2::XScaling >& xScalingX, const Reference< chart2::XScaling >& /* xScalingY */, sal_Bool /* bMaySkipPointsInCalculation */ ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if( nPointCount < 2 ) throw lang::IllegalArgumentException(); @@ -137,13 +137,13 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa } double SAL_CALL RegressionCurveCalculator::getCorrelationCoefficient() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_fCorrelationCoeffitient; } OUString SAL_CALL RegressionCurveCalculator::getRepresentation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ImplGetRepresentation( Reference< util::XNumberFormatter >(), 0 ); } @@ -151,7 +151,7 @@ OUString SAL_CALL RegressionCurveCalculator::getRepresentation() OUString SAL_CALL RegressionCurveCalculator::getFormattedRepresentation( const Reference< util::XNumberFormatsSupplier > & xNumFmtSupplier, sal_Int32 nNumberFormatKey ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // create and prepare a number formatter if( !xNumFmtSupplier.is()) diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 2ff4f4523e9d..f921ae82343c 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -216,19 +216,19 @@ RegressionCurveModel::~RegressionCurveModel() // ____ XRegressionCurve ____ uno::Reference< chart2::XRegressionCurveCalculator > SAL_CALL RegressionCurveModel::getCalculator() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( getServiceName()); } uno::Reference< beans::XPropertySet > SAL_CALL RegressionCurveModel::getEquationProperties() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_xEquationProperties; } void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< beans::XPropertySet >& xEquationProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( xEquationProperties.is()) { @@ -243,7 +243,7 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< // ____ XServiceName ____ OUString SAL_CALL RegressionCurveModel::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { switch( m_eRegressionCurveType ) { @@ -268,7 +268,7 @@ OUString SAL_CALL RegressionCurveModel::getServiceName() // ____ XModifyBroadcaster ____ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -282,7 +282,7 @@ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< uti } void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -297,14 +297,14 @@ void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< // ____ XModifyListener ____ void SAL_CALL RegressionCurveModel::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL RegressionCurveModel::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } @@ -338,7 +338,7 @@ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL RegressionCurveModel::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticRegressionCurveInfo::get(); } @@ -372,7 +372,7 @@ uno::Sequence< OUString > MeanValueRegressionCurve::getSupportedServiceNames_Sta APPHELPER_XSERVICEINFO_IMPL( MeanValueRegressionCurve, lcl_aImplementationName_MeanValue ); uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new MeanValueRegressionCurve( *this )); } @@ -398,7 +398,7 @@ uno::Sequence< OUString > LinearRegressionCurve::getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( LinearRegressionCurve, lcl_aImplementationName_Linear ); uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LinearRegressionCurve( *this )); } @@ -424,7 +424,7 @@ uno::Sequence< OUString > LogarithmicRegressionCurve::getSupportedServiceNames_S APPHELPER_XSERVICEINFO_IMPL( LogarithmicRegressionCurve, lcl_aImplementationName_Logarithmic ); uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LogarithmicRegressionCurve( *this )); } @@ -450,7 +450,7 @@ uno::Sequence< OUString > ExponentialRegressionCurve::getSupportedServiceNames_S APPHELPER_XSERVICEINFO_IMPL( ExponentialRegressionCurve, lcl_aImplementationName_Exponential ); uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ExponentialRegressionCurve( *this )); } @@ -476,7 +476,7 @@ uno::Sequence< OUString > PotentialRegressionCurve::getSupportedServiceNames_Sta APPHELPER_XSERVICEINFO_IMPL( PotentialRegressionCurve, lcl_aImplementationName_Potential ); uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PotentialRegressionCurve( *this )); } @@ -502,7 +502,7 @@ uno::Sequence< OUString > PolynomialRegressionCurve::getSupportedServiceNames_St APPHELPER_XSERVICEINFO_IMPL( PolynomialRegressionCurve, lcl_aImplementationName_Polynomial ); uno::Reference< util::XCloneable > SAL_CALL PolynomialRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PolynomialRegressionCurve( *this )); } @@ -528,7 +528,7 @@ uno::Sequence< OUString > MovingAverageRegressionCurve::getSupportedServiceNames APPHELPER_XSERVICEINFO_IMPL( MovingAverageRegressionCurve, lcl_aImplementationName_MovingAverage ); uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new MovingAverageRegressionCurve( *this )); } diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index a077b687b43e..3da827761450 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -88,21 +88,21 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XRegressionCurve ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getEquationProperties() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setEquationProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xEquationProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ // not implemented here @@ -112,20 +112,20 @@ protected: // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); using ::cppu::OPropertySetHelper::disposing; @@ -159,7 +159,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -179,7 +179,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -199,7 +199,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -219,7 +219,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -239,7 +239,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -259,7 +259,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -279,7 +279,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index acbc9e55a2fc..22f67a413c1d 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -197,7 +197,7 @@ RegressionEquation::~RegressionEquation() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL RegressionEquation::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new RegressionEquation( *this )); } @@ -220,14 +220,14 @@ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL RegressionEquation::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticRegressionEquationInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -241,7 +241,7 @@ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util: } void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -256,14 +256,14 @@ void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< ut // ____ XModifyListener ____ void SAL_CALL RegressionEquation::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL RegressionEquation::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } @@ -281,14 +281,14 @@ void RegressionEquation::fireModifyEvent() // ____ XTitle ____ uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL RegressionEquation::getText() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_aStrings; } void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< chart2::XFormattedString > >& Strings ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); ModifyListenerHelper::removeListenerFromAllElements( diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index 2546071cd052..f3239fe77885 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -76,39 +76,39 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTitle ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > > SAL_CALL getText() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setText( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > >& Strings ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); using ::cppu::OPropertySetHelper::disposing; diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 7b710ceeeb7a..e30f8d0b5037 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -55,7 +55,7 @@ LogarithmicScaling::~LogarithmicScaling() double SAL_CALL LogarithmicScaling::doScaling( double value ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -67,14 +67,14 @@ LogarithmicScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL LogarithmicScaling::getInverseScaling() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return new ExponentialScaling( m_fBase ); } OUString SAL_CALL LogarithmicScaling::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return lcl_aServiceName_Logarithmic; } @@ -104,7 +104,7 @@ ExponentialScaling::~ExponentialScaling() double SAL_CALL ExponentialScaling::doScaling( double value ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -116,14 +116,14 @@ ExponentialScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL ExponentialScaling::getInverseScaling() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return new LogarithmicScaling( m_fBase ); } OUString SAL_CALL ExponentialScaling::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return lcl_aServiceName_Exponential; } @@ -151,7 +151,7 @@ LinearScaling::~LinearScaling() {} double SAL_CALL LinearScaling::doScaling( double value ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -163,7 +163,7 @@ double SAL_CALL LinearScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL LinearScaling::getInverseScaling() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // ToDo: ApproxEqual ? if( m_fSlope == 0 ) @@ -174,7 +174,7 @@ uno::Reference< XScaling > SAL_CALL OUString SAL_CALL LinearScaling::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return lcl_aServiceName_Linear; } @@ -200,7 +200,7 @@ PowerScaling::~PowerScaling() {} double SAL_CALL PowerScaling::doScaling( double value ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -212,7 +212,7 @@ double SAL_CALL PowerScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL PowerScaling::getInverseScaling() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // ToDo: ApproxEqual ? if( m_fExponent == 0 ) @@ -223,7 +223,7 @@ uno::Reference< XScaling > SAL_CALL OUString SAL_CALL PowerScaling::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return lcl_aServiceName_Power; } diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index aff3f2a13093..6498e57d3cc1 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -134,7 +134,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UncachedDataSequence, UncachedDataSequence_Bas // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertySetInfo() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } @@ -160,7 +160,7 @@ APPHELPER_XSERVICEINFO_IMPL( UncachedDataSequence, lcl_aServiceName ) // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< double > aResult; MutexGuard aGuard( GetMutex() ); @@ -176,7 +176,7 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() // ________ XTextualDataSequence ________ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< OUString > aResult; MutexGuard aGuard( GetMutex() ); @@ -192,7 +192,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() // ________ XDataSequence ________ Sequence< Any > SAL_CALL UncachedDataSequence::getData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); if( m_xDataProvider.is()) @@ -201,13 +201,13 @@ Sequence< Any > SAL_CALL UncachedDataSequence::getData() } OUString SAL_CALL UncachedDataSequence::getSourceRangeRepresentation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return getName(); } Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data::LabelOrigin ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // auto-generated label is an empty string return Sequence< OUString >(1); @@ -215,7 +215,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data: ::sal_Int32 SAL_CALL UncachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return m_nNumberFormatKey; } @@ -225,7 +225,7 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); Sequence< Any > aData( getData()); @@ -240,7 +240,7 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno // ____ XIndexAccess (base of XIndexReplace) ____ ::sal_Int32 SAL_CALL UncachedDataSequence::getCount() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Implement!" ); return 0; @@ -249,7 +249,7 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "Implement!" ); return uno::Any(); @@ -257,13 +257,13 @@ uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 ) // ____ XElementAccess (base of XIndexAccess) ____ uno::Type SAL_CALL UncachedDataSequence::getElementType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ::getCppuType( reinterpret_cast< uno::Any * >(0)); } ::sal_Bool SAL_CALL UncachedDataSequence::hasElements() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xDataProvider.is()) return sal_False; @@ -272,20 +272,20 @@ uno::Type SAL_CALL UncachedDataSequence::getElementType() // ____ XNamed ____ OUString SAL_CALL UncachedDataSequence::getName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_aSourceRepresentation; } void SAL_CALL UncachedDataSequence::setName( const OUString& aName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aSourceRepresentation = aName; fireModifyEvent(); } Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { UncachedDataSequence * pNewSeq = new UncachedDataSequence( *this ); return Reference< util::XCloneable >( pNewSeq ); @@ -293,14 +293,14 @@ Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone() // ____ XModifiable ____ ::sal_Bool SAL_CALL UncachedDataSequence::isModified() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return sal_False; } void SAL_CALL UncachedDataSequence::setModified( ::sal_Bool bModified ) throw (beans::PropertyVetoException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( bModified ) fireModifyEvent(); @@ -308,7 +308,7 @@ void SAL_CALL UncachedDataSequence::setModified( ::sal_Bool bModified ) // ____ XModifyBroadcaster (base of XModifiable) ____ void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -322,7 +322,7 @@ void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XM } void SAL_CALL UncachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx index fc5429337d80..3a19c1807a99 100644 --- a/chart2/source/tools/WeakListenerAdapter.cxx +++ b/chart2/source/tools/WeakListenerAdapter.cxx @@ -36,7 +36,7 @@ WeakModifyListenerAdapter::~WeakModifyListenerAdapter() {} void SAL_CALL WeakModifyListenerAdapter::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModListener( getListener() ); if( xModListener.is()) @@ -52,7 +52,7 @@ WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter() {} void SAL_CALL WeakSelectionChangeListenerAdapter::selectionChanged( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< view::XSelectionChangeListener > xSelChgListener( getListener() ); if( xSelChgListener.is()) diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index b967bd128f69..86c4195003e2 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -71,7 +71,7 @@ void WrappedPropertySet::clearWrappedPropertySet() //XPropertySet Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySetInfo( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySetInfo > xInfo = m_xInfo; if( !xInfo.is() ) @@ -93,7 +93,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySet } void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { try { @@ -140,7 +140,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam } } Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -184,7 +184,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName } void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -197,7 +197,7 @@ void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPr } } void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& aListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -210,7 +210,7 @@ void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& } } void SAL_CALL WrappedPropertySet::addVetoableChangeListener( const OUString& rPropertyName, const Reference< beans::XVetoableChangeListener >& aListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -223,7 +223,7 @@ void SAL_CALL WrappedPropertySet::addVetoableChangeListener( const OUString& rPr } } void SAL_CALL WrappedPropertySet::removeVetoableChangeListener( const OUString& rPropertyName, const Reference< beans::XVetoableChangeListener >& aListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -238,7 +238,7 @@ void SAL_CALL WrappedPropertySet::removeVetoableChangeListener( const OUString& //XMultiPropertySet void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& rNameSeq, const Sequence< Any >& rValueSeq ) - throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { bool bUnknownProperty = false; sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); @@ -262,7 +262,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& // throw beans::UnknownPropertyException(); } Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< OUString >& rNameSeq ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -288,19 +288,19 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< return aRetSeq; } void SAL_CALL WrappedPropertySet::addPropertiesChangeListener( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); //todo } void SAL_CALL WrappedPropertySet::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); //todo } void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); //todo @@ -308,7 +308,7 @@ void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUS //XPropertyState beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); @@ -339,7 +339,7 @@ const WrappedProperty* WrappedPropertySet::getWrappedProperty( sal_Int32 nHandle } Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( const Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -355,7 +355,7 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( } void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); if( xInnerPropertyState.is() ) @@ -368,7 +368,7 @@ void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropert } } Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); @@ -385,7 +385,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyNa //XMultiPropertyStates void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = getPropertySequence(); for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++) @@ -395,7 +395,7 @@ void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( ) } } void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { @@ -404,7 +404,7 @@ void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUStri } } Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx index 685a5690c48a..86eeea128c14 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -51,7 +51,7 @@ DateScaling::~DateScaling() } double SAL_CALL DateScaling::doScaling( double value ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fResult(value); if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -92,13 +92,13 @@ double SAL_CALL DateScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL DateScaling::getInverseScaling() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return new InverseDateScaling( m_aNullDate, m_nTimeUnit, m_bShifted ); } OUString SAL_CALL DateScaling::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return lcl_aServiceName_DateScaling; } @@ -123,7 +123,7 @@ InverseDateScaling::~InverseDateScaling() } double SAL_CALL InverseDateScaling::doScaling( double value ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fResult(value); if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -171,13 +171,13 @@ double SAL_CALL InverseDateScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL InverseDateScaling::getInverseScaling() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return new DateScaling( m_aNullDate, m_nTimeUnit, m_bShifted ); } OUString SAL_CALL InverseDateScaling::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return lcl_aServiceName_InverseDateScaling; } diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx index 44411a1b168b..74c784b794d6 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -48,15 +48,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const Date m_aNullDate; @@ -80,15 +80,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const Date m_aNullDate; diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index fe1aab84f37a..956ff81485a1 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -46,7 +46,7 @@ public: //XTextualDataSequence virtual uno::Sequence< OUString > SAL_CALL getTextualData() - throw ( uno::RuntimeException) + throw ( uno::RuntimeException, std::exception) { return m_aTextSequence; } diff --git a/chart2/source/view/inc/DummyXShape.hxx b/chart2/source/view/inc/DummyXShape.hxx index 4783cf696218..2a07094a5b42 100644 --- a/chart2/source/view/inc/DummyXShape.hxx +++ b/chart2/source/view/inc/DummyXShape.hxx @@ -109,54 +109,54 @@ public: DummyXShape(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XShape - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::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); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); // normal non UNO methods @@ -337,9 +337,9 @@ public: virtual void render() SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); private: void setTransformatAsProperty(const com::sun::star::drawing::HomogenMatrix3& rMatrix); @@ -364,22 +364,22 @@ class DummyXShapes : public DummyXShape, public com::sun::star::drawing::XShapes { public: - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( const com::sun::star::uno::Type& rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Any SAL_CALL queryAggregation( const com::sun::star::uno::Type& rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // normal methods virtual void render(); @@ -396,8 +396,8 @@ public: ~DummyChart(); virtual DummyChart* getRootShape(); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void render() SAL_OVERRIDE; @@ -422,10 +422,10 @@ class DummyGroup2D : public DummyXShapes public: DummyGroup2D(const OUString& rName); - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); }; class DummyGroup3D : public DummyXShapes diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx index e8510af3d5e9..d27bc7d39104 100644 --- a/chart2/source/view/inc/Linear3DTransformation.hxx +++ b/chart2/source/view/inc/Linear3DTransformation.hxx @@ -39,13 +39,13 @@ public: virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( const ::com::sun::star::uno::Sequence< double >& rSourceValues ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::drawing::HomogenMatrix m_Matrix; diff --git a/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx index 43554cff8210..470952f9c8d5 100644 --- a/chart2/source/view/inc/VPolarTransformation.hxx +++ b/chart2/source/view/inc/VPolarTransformation.hxx @@ -39,13 +39,13 @@ public: virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( const ::com::sun::star::uno::Sequence< double >& rSourceValues ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: PolarPlottingPositionHelper m_aPositionHelper; diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index c972af0bd04d..99e7b348c8e8 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -185,7 +185,7 @@ void ChartView::init() } void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >& ) - throw ( uno::Exception, uno::RuntimeException) + throw ( uno::Exception, uno::RuntimeException, std::exception) { init(); } @@ -289,7 +289,7 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre } uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aFlavor ) - throw (datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException) + throw (datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception) { bool bHighContrastMetaFile( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast)); uno::Any aRet; @@ -323,7 +323,7 @@ uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aF return aRet; } uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFlavors() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< datatransfer::DataFlavor > aRet(2); @@ -337,7 +337,7 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla return aRet; } ::sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMEType) || aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast) ); @@ -345,7 +345,7 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla // ____ XUnoTunnel ___ ::sal_Int64 SAL_CALL ChartView::getSomething( const uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { if( aIdentifier.getLength() == 16 && 0 == memcmp( ExplicitValueProvider::getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) @@ -2623,7 +2623,7 @@ void ChartView::createShapes() // util::XEventListener (base of XCloseListener) void SAL_CALL ChartView::disposing( const lang::EventObject& /* rSource */ ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { } @@ -2696,7 +2696,7 @@ void ChartView::impl_updateView() // ____ XModifyListener ____ void SAL_CALL ChartView::modified( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_bViewDirty = true; if( m_bInViewUpdate ) @@ -2794,24 +2794,24 @@ void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode ) // ____ XModeChangeBroadcaster ____ void SAL_CALL ChartView::addModeChangeListener( const uno::Reference< util::XModeChangeListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aListenerContainer.addInterface( ::getCppuType((const uno::Reference< util::XModeChangeListener >*)0), xListener ); } void SAL_CALL ChartView::removeModeChangeListener( const uno::Reference< util::XModeChangeListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aListenerContainer.removeInterface( ::getCppuType((const uno::Reference< util::XModeChangeListener >*)0), xListener ); } void SAL_CALL ChartView::addModeChangeApproveListener( const uno::Reference< util::XModeChangeApproveListener >& /* _rxListener */ ) - throw (lang::NoSupportException, uno::RuntimeException) + throw (lang::NoSupportException, uno::RuntimeException, std::exception) { } void SAL_CALL ChartView::removeModeChangeApproveListener( const uno::Reference< util::XModeChangeApproveListener >& /* _rxListener */ ) - throw (lang::NoSupportException, uno::RuntimeException) + throw (lang::NoSupportException, uno::RuntimeException, std::exception) { } @@ -2832,7 +2832,7 @@ void SAL_CALL ChartView::update() throw (uno::RuntimeException, std::exception) // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); return 0; @@ -2841,7 +2841,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo() void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName , const Any& rValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException - , lang::WrappedTargetException, uno::RuntimeException) + , lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( rPropertyName.equals("Resolution") ) { @@ -2894,7 +2894,7 @@ void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName } Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; if( rPropertyName.equals("Resolution") ) @@ -2908,25 +2908,25 @@ Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName ) void SAL_CALL ChartView::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ChartView::removePropertyChangeListener( const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ChartView::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ChartView::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -2934,7 +2934,7 @@ void SAL_CALL ChartView::removeVetoableChangeListener( const OUString& /* Proper // ____ XMultiServiceFactory ____ Reference< uno::XInterface > ChartView::createInstance( const OUString& aServiceSpecifier ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { SdrModel* pModel = ( m_pDrawModelWrapper ? &m_pDrawModelWrapper->getSdrModel() : NULL ); if ( pModel ) @@ -2993,14 +2993,14 @@ Reference< uno::XInterface > ChartView::createInstance( const OUString& aService } Reference< uno::XInterface > ChartView::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { OSL_ENSURE( Arguments.getLength(), "ChartView::createInstanceWithArguments: arguments are ignored" ); (void) Arguments; // avoid warning return createInstance( ServiceSpecifier ); } -uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aServiceNames( 6 ); diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 6b28c43b4aee..8d4ac25efb2a 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -56,26 +56,26 @@ public: mrProperties(rProps) {} virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& rName ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual beans::Property SAL_CALL getPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, beans::UnknownPropertyException); + throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception); virtual uno::Sequence< beans::Property > SAL_CALL getProperties() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); private: const std::map<OUString, uno::Any>& mrProperties; }; sal_Bool SAL_CALL DummyPropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return mrProperties.find(rName) != mrProperties.end(); } beans::Property SAL_CALL DummyPropertySetInfo::getPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, beans::UnknownPropertyException) + throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception) { beans::Property aRet; if(mrProperties.find(rName) == mrProperties.end()) @@ -89,7 +89,7 @@ beans::Property SAL_CALL DummyPropertySetInfo::getPropertyByName( const OUString } uno::Sequence< beans::Property > SAL_CALL DummyPropertySetInfo::getProperties() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence< beans::Property > aRet(mrProperties.size()); @@ -134,49 +134,49 @@ DummyXShape::DummyXShape() } OUString SAL_CALL DummyXShape::getName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maName; } void SAL_CALL DummyXShape::setName( const OUString& rName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { maName = rName; } awt::Point SAL_CALL DummyXShape::getPosition() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maPosition; } void SAL_CALL DummyXShape::setPosition( const awt::Point& rPoint ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { maPosition = rPoint; } awt::Size SAL_CALL DummyXShape::getSize() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maSize; } void SAL_CALL DummyXShape::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException) + throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { maSize = rSize; } OUString SAL_CALL DummyXShape::getShapeType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString("dummy shape"); } uno::Reference< beans::XPropertySetInfo > SAL_CALL DummyXShape::getPropertySetInfo() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return new DummyPropertySetInfo(maProperties); } @@ -184,7 +184,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL DummyXShape::getPropertySetIn void SAL_CALL DummyXShape::setPropertyValue( const OUString& rName, const uno::Any& rValue) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { SAL_WARN("chart2", "DummyXShape::setProperty: " << rName << " " << "Any"); maProperties[rName] = rValue; @@ -195,7 +195,7 @@ void SAL_CALL DummyXShape::setPropertyValue( const OUString& rName, const uno::A } uno::Any SAL_CALL DummyXShape::getPropertyValue( const OUString& rName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("chart2.opengl", "DummyXShape::getPropertyValue: " << rName); std::map<OUString, uno::Any>::iterator itr = maProperties.find(rName); @@ -206,29 +206,29 @@ uno::Any SAL_CALL DummyXShape::getPropertyValue( const OUString& rName ) } void SAL_CALL DummyXShape::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::setPropertyValues( const uno::Sequence< OUString >& rNames, const uno::Sequence< uno::Any >& rValues) throw (beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { size_t n = std::min<size_t>(rNames.getLength(), rValues.getLength()); for(size_t i = 0; i < n; ++i) @@ -239,7 +239,7 @@ throw (beans::PropertyVetoException, lang::IllegalArgumentException, uno::Sequence< uno::Any > SAL_CALL DummyXShape::getPropertyValues( const uno::Sequence< OUString >& rNames) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Any > aValues(rNames.getLength()); for(sal_Int32 i = 0; i < rNames.getLength(); ++i) @@ -253,22 +253,22 @@ uno::Sequence< uno::Any > SAL_CALL DummyXShape::getPropertyValues( return aValues; } -void SAL_CALL DummyXShape::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) +void SAL_CALL DummyXShape::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) { } -void SAL_CALL DummyXShape::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) +void SAL_CALL DummyXShape::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } OUString SAL_CALL DummyXShape::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString("DummyXShape"); } @@ -292,25 +292,25 @@ uno::Sequence< OUString > listSupportedServices() } uno::Sequence< OUString > SAL_CALL DummyXShape::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return listSupportedServices(); } sal_Bool SAL_CALL DummyXShape::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Reference< uno::XInterface > SAL_CALL DummyXShape::getParent() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return mxParent; } void SAL_CALL DummyXShape::setParent( const uno::Reference< uno::XInterface >& xParent ) - throw(lang::NoSupportException, uno::RuntimeException) + throw(lang::NoSupportException, uno::RuntimeException, std::exception) { mxParent = xParent; } @@ -856,7 +856,7 @@ void DummyText::render() void SAL_CALL DummyText::setPropertyValue( const OUString& rName, const uno::Any& rValue) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { SAL_WARN("chart2.opengl", "property value set after image has been created"); SAL_WARN("chart2.opengl", rName); @@ -864,7 +864,7 @@ void SAL_CALL DummyText::setPropertyValue( const OUString& rName, const uno::Any } void SAL_CALL DummyText::setPosition(const awt::Point& rPosition ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { DummyXShape::setPosition(rPosition); if(maTrans.hasValue()) @@ -908,7 +908,7 @@ DummyGroup2D::DummyGroup2D(const OUString& rName) } awt::Point SAL_CALL DummyGroup2D::getPosition() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { long nTop = std::numeric_limits<long>::max(); long nLeft = std::numeric_limits<long>::max(); @@ -927,7 +927,7 @@ awt::Point SAL_CALL DummyGroup2D::getPosition() } awt::Size SAL_CALL DummyGroup2D::getSize() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { long nTop = std::numeric_limits<long>::max(); long nLeft = std::numeric_limits<long>::max(); @@ -948,7 +948,7 @@ awt::Size SAL_CALL DummyGroup2D::getSize() } void SAL_CALL DummyGroup2D::setPosition( const awt::Point& rPos ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { for(std::vector<DummyXShape*>::const_iterator itr = maShapes.begin(), itrEnd = maShapes.end(); itr != itrEnd; ++itr) @@ -960,7 +960,7 @@ void SAL_CALL DummyGroup2D::setPosition( const awt::Point& rPos ) } void SAL_CALL DummyGroup2D::setSize( const awt::Size& ) - throw( beans::PropertyVetoException, uno::RuntimeException ) + throw( beans::PropertyVetoException, uno::RuntimeException, std::exception ) { SAL_WARN("chart2.opengl", "set size on group shape"); } @@ -995,7 +995,7 @@ DummyChart* DummyChart::getRootShape() return uno::makeAny(uno::Reference<xint>(this)); uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { QUERY_INTERFACE( drawing::XShapes ); QUERY_INTERFACE( container::XIndexAccess ); @@ -1003,7 +1003,7 @@ uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType ) } uno::Any SAL_CALL DummyXShapes::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Any aAny; @@ -1028,7 +1028,7 @@ void DummyXShapes::release() } void SAL_CALL DummyXShapes::add( const uno::Reference< drawing::XShape>& xShape ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { DummyXShape* pChild = dynamic_cast<DummyXShape*>(xShape.get()); assert(pChild); @@ -1038,7 +1038,7 @@ void SAL_CALL DummyXShapes::add( const uno::Reference< drawing::XShape>& xShape } void SAL_CALL DummyXShapes::remove( const uno::Reference< drawing::XShape>& xShape ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { std::vector< uno::Reference<drawing::XShape> >::iterator itr = std::find(maUNOShapes.begin(), maUNOShapes.end(), xShape); if(itr != maUNOShapes.end()) @@ -1053,26 +1053,26 @@ void SAL_CALL DummyXShapes::remove( const uno::Reference< drawing::XShape>& xSha } uno::Type SAL_CALL DummyXShapes::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return ::getCppuType(( const uno::Reference< drawing::XShape >*)0); } sal_Bool SAL_CALL SAL_CALL DummyXShapes::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return !maUNOShapes.empty(); } sal_Int32 SAL_CALL DummyXShapes::getCount() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maUNOShapes.size(); } uno::Any SAL_CALL DummyXShapes::getByIndex(sal_Int32 nIndex) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Any aShape; aShape <<= maUNOShapes[nIndex]; @@ -1499,7 +1499,7 @@ void DummyChart::createGLContext() } void SAL_CALL DummyChart::setPosition( const awt::Point& aPosition ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { DummyXShape::setPosition(aPosition); } @@ -1509,7 +1509,7 @@ DummyChart::~DummyChart() } void SAL_CALL DummyChart::setSize( const awt::Size& aSize ) - throw( beans::PropertyVetoException, uno::RuntimeException ) + throw( beans::PropertyVetoException, uno::RuntimeException, std::exception ) { SAL_INFO("chart2.opengl", "DummyChart::setSize()---aSize.Width = " << aSize.Width << ", aSize.Height = " << aSize.Height); int width = aSize.Width / OPENGL_SCALE_VALUE; diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx index c909d24cdfa2..30597f83f578 100644 --- a/chart2/source/view/main/Linear3DTransformation.cxx +++ b/chart2/source/view/main/Linear3DTransformation.cxx @@ -40,7 +40,7 @@ Linear3DTransformation::~Linear3DTransformation() Sequence< double > SAL_CALL Linear3DTransformation::transform( const Sequence< double >& rSourceValues ) throw (RuntimeException, - lang::IllegalArgumentException) + lang::IllegalArgumentException, std::exception) { double fX = rSourceValues[0]; double fY = rSourceValues[1]; @@ -82,13 +82,13 @@ Sequence< double > SAL_CALL Linear3DTransformation::transform( } sal_Int32 SAL_CALL Linear3DTransformation::getSourceDimension() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return 3; } sal_Int32 SAL_CALL Linear3DTransformation::getTargetDimension() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return 3; } diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx index 856509c2c878..e75e2a13b19d 100644 --- a/chart2/source/view/main/VPolarTransformation.cxx +++ b/chart2/source/view/main/VPolarTransformation.cxx @@ -44,7 +44,7 @@ VPolarTransformation::~VPolarTransformation() Sequence< double > SAL_CALL VPolarTransformation::transform( const Sequence< double >& rSourceValues ) throw (RuntimeException, - lang::IllegalArgumentException) + lang::IllegalArgumentException, std::exception) { double fScaledLogicAngle = rSourceValues[0]; double fScaledLogicRadius = rSourceValues[1]; @@ -67,13 +67,13 @@ Sequence< double > SAL_CALL VPolarTransformation::transform( } sal_Int32 SAL_CALL VPolarTransformation::getSourceDimension() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return 3; } sal_Int32 SAL_CALL VPolarTransformation::getTargetDimension() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return 3; } |