diff options
Diffstat (limited to 'chart2')
295 files changed, 1599 insertions, 4482 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 0a0889138a40..05999229a296 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -180,21 +180,17 @@ private: /// @throws css::uno::RuntimeException css::uno::Reference< css::frame::XController > - impl_getCurrentController() - throw( css::uno::RuntimeException); + impl_getCurrentController(); /// @throws css::uno::RuntimeException void SAL_CALL - impl_notifyModifiedListeners() - throw( css::uno::RuntimeException); + impl_notifyModifiedListeners(); /// @throws css::uno::RuntimeException void SAL_CALL - impl_notifyCloseListeners() - throw( css::uno::RuntimeException); + impl_notifyCloseListeners(); /// @throws css::uno::RuntimeException void SAL_CALL - impl_notifyStorageChangeListeners() - throw(css::uno::RuntimeException); + impl_notifyStorageChangeListeners(); void impl_store( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor, @@ -223,349 +219,241 @@ public: // css::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::lang::XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // css::frame::XModel (required interface) virtual sal_Bool SAL_CALL attachResource( const OUString& rURL, - const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; virtual OUString SAL_CALL - getURL() throw (css::uno::RuntimeException, std::exception) override; + getURL() override; virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL - getArgs() throw (css::uno::RuntimeException, std::exception) override; + getArgs() override; virtual void SAL_CALL - connectController( const css::uno::Reference< css::frame::XController >& xController ) - throw (css::uno::RuntimeException, std::exception) override; + connectController( const css::uno::Reference< css::frame::XController >& xController ) override; virtual void SAL_CALL - disconnectController( const css::uno::Reference< css::frame::XController >& xController ) - throw (css::uno::RuntimeException, std::exception) override; + disconnectController( const css::uno::Reference< css::frame::XController >& xController ) override; virtual void SAL_CALL - lockControllers() throw (css::uno::RuntimeException, std::exception) override; + lockControllers() override; virtual void SAL_CALL - unlockControllers() throw (css::uno::RuntimeException, std::exception) override; + unlockControllers() override; virtual sal_Bool SAL_CALL - hasControllersLocked() - throw (css::uno::RuntimeException, std::exception) override; + hasControllersLocked() override; virtual css::uno::Reference< css::frame::XController > SAL_CALL - getCurrentController() - throw (css::uno::RuntimeException, std::exception) override; + getCurrentController() override; virtual void SAL_CALL - setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) - throw (css::container::NoSuchElementException - , css::uno::RuntimeException, std::exception) override; + setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - getCurrentSelection() - throw (css::uno::RuntimeException, std::exception) override; + getCurrentSelection() override; // css::lang::XComponent (base of XModel) virtual void SAL_CALL - dispose() throw (css::uno::RuntimeException, std::exception) override; + dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override; // css::util::XCloseable virtual void SAL_CALL - close( sal_Bool bDeliverOwnership ) - throw(css::util::CloseVetoException, - css::uno::RuntimeException, std::exception) override; + close( sal_Bool bDeliverOwnership ) override; // css::util::XCloseBroadcaster (base of XCloseable) virtual void SAL_CALL - addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) override; virtual void SAL_CALL - removeCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) override; // css::frame::XStorable2 (extension of XStorable) virtual void SAL_CALL storeSelf( - const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; // css::frame::XStorable (required interface) virtual sal_Bool SAL_CALL - hasLocation() throw (css::uno::RuntimeException, std::exception) override; + hasLocation() override; virtual OUString SAL_CALL - getLocation() throw (css::uno::RuntimeException, std::exception) override; + getLocation() override; virtual sal_Bool SAL_CALL - isReadonly() throw (css::uno::RuntimeException, std::exception) override; + isReadonly() override; virtual void SAL_CALL - store() throw (css::io::IOException - , css::uno::RuntimeException, std::exception) override; + store() override; virtual void SAL_CALL storeAsURL( const OUString& rURL, - const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::io::IOException - , css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; virtual void SAL_CALL storeToURL( const OUString& rURL, - const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::io::IOException - , css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; // css::util::XModifiable (required interface) virtual sal_Bool SAL_CALL - isModified() throw (css::uno::RuntimeException, std::exception) override; + isModified() override; virtual void SAL_CALL - setModified( sal_Bool bModified ) - throw (css::beans::PropertyVetoException - , css::uno::RuntimeException, std::exception) override; + setModified( sal_Bool bModified ) override; // css::util::XModifyBroadcaster (base of XModifiable) virtual void SAL_CALL - addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override; virtual void SAL_CALL - removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ datatransferable::XTransferable ____ virtual css::uno::Any SAL_CALL getTransferData( - const css::datatransfer::DataFlavor& aFlavor ) - throw (css::datatransfer::UnsupportedFlavorException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() - throw (css::uno::RuntimeException, std::exception) override; + const css::datatransfer::DataFlavor& aFlavor ) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() override; virtual sal_Bool SAL_CALL isDataFlavorSupported( - const css::datatransfer::DataFlavor& aFlavor ) - throw (css::uno::RuntimeException, std::exception) override; + const css::datatransfer::DataFlavor& aFlavor ) override; // lang::XTypeProvider (override method of WeakImplHelper) virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; // ____ document::XDocumentPropertiesSupplier ____ virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL - getDocumentProperties( ) throw (css::uno::RuntimeException, std::exception) override; + getDocumentProperties( ) override; // ____ document::XUndoManagerSupplier ____ virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL - getUndoManager( ) throw (css::uno::RuntimeException, std::exception) override; + getUndoManager( ) override; // css::chart2::XChartDocument virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL - getFirstDiagram() throw (css::uno::RuntimeException, std::exception) override; + getFirstDiagram() override; virtual void SAL_CALL setFirstDiagram( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; virtual void SAL_CALL - createInternalDataProvider( sal_Bool bCloneExistingData ) - throw (css::util::CloseVetoException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasInternalDataProvider() - throw (css::uno::RuntimeException, std::exception) override; + createInternalDataProvider( sal_Bool bCloneExistingData ) override; + virtual sal_Bool SAL_CALL hasInternalDataProvider() override; virtual css::uno::Reference< css::chart2::data::XDataProvider > SAL_CALL - getDataProvider() - throw (css::uno::RuntimeException, std::exception) override; + getDataProvider() override; virtual void SAL_CALL - setChartTypeManager( const css::uno::Reference< css::chart2::XChartTypeManager >& xNewManager ) - throw (css::uno::RuntimeException, std::exception) override; + setChartTypeManager( const css::uno::Reference< css::chart2::XChartTypeManager >& xNewManager ) override; virtual css::uno::Reference< css::chart2::XChartTypeManager > SAL_CALL - getChartTypeManager() - throw (css::uno::RuntimeException, std::exception) override; + getChartTypeManager() override; virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - getPageBackground() - throw (css::uno::RuntimeException, std::exception) override; + getPageBackground() override; - virtual void SAL_CALL createDefaultChart() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL createDefaultChart() override; - virtual sal_Bool SAL_CALL isOpenGLChart() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isOpenGLChart() override; // ____ XDataReceiver (public API) ____ virtual void SAL_CALL - attachDataProvider( const css::uno::Reference< css::chart2::data::XDataProvider >& xProvider ) - throw (css::uno::RuntimeException, std::exception) override; + attachDataProvider( const css::uno::Reference< css::chart2::data::XDataProvider >& xProvider ) override; virtual void SAL_CALL setArguments( - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL getUsedData() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() override; + virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL getUsedData() override; virtual void SAL_CALL attachNumberFormatsSupplier( const css::uno::Reference< - css::util::XNumberFormatsSupplier >& xSupplier ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter() - throw (css::uno::RuntimeException, std::exception) override; + css::util::XNumberFormatsSupplier >& xSupplier ) override; + virtual css::uno::Reference< css::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter() override; // ____ XTitled ____ - virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTitleObject( const css::uno::Reference< css::chart2::XTitle >& Title ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() override; + virtual void SAL_CALL setTitleObject( const css::uno::Reference< css::chart2::XTitle >& Title ) override; // ____ XInterface (for old API wrapper) ____ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; // ____ XLoadable ____ - virtual void SAL_CALL initNew() - throw (css::frame::DoubleInitializationException, - css::io::IOException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::frame::DoubleInitializationException, - css::io::IOException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initNew() override; + virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XVisualObject ____ virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, - const css::awt::Size& aSize ) - throw (css::lang::IllegalArgumentException, - css::embed::WrongStateException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::awt::Size& aSize ) override; virtual css::awt::Size SAL_CALL getVisualAreaSize( - ::sal_Int64 nAspect ) - throw (css::lang::IllegalArgumentException, - css::embed::WrongStateException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + ::sal_Int64 nAspect ) override; virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( - ::sal_Int64 nAspect ) - throw (css::lang::IllegalArgumentException, - css::embed::WrongStateException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + ::sal_Int64 nAspect ) override; virtual ::sal_Int32 SAL_CALL getMapUnit( - ::sal_Int64 nAspect ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + ::sal_Int64 nAspect ) override; // ____ XMultiServiceFactory ____ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - createInstance( const OUString& aServiceSpecifier ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + createInstance( const OUString& aServiceSpecifier ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier - , const css::uno::Sequence< css::uno::Any >& Arguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + , const css::uno::Sequence< css::uno::Any >& Arguments ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override; + getAvailableServiceNames() override; // ____ XStorageBasedDocument ____ virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, - const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::lang::IllegalArgumentException, - css::frame::DoubleInitializationException, - css::io::IOException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, - const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; virtual void SAL_CALL switchToStorage( - const css::uno::Reference< css::embed::XStorage >& xStorage ) - throw (css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage() - throw (css::io::IOException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::embed::XStorage >& xStorage ) override; + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage() override; virtual void SAL_CALL addStorageChangeListener( - const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override; virtual void SAL_CALL removeStorageChangeListener( - const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override; // for SvNumberFormatsSupplierObj // ____ XUnoTunnel ___ - virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) override; // ____ XNumberFormatsSupplier ____ - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() override; + virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats() override; // ____ XChild ____ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() override; virtual void SAL_CALL setParent( - const css::uno::Reference< css::uno::XInterface >& Parent ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::uno::XInterface >& Parent ) override; // ____ XDataSource ____ allows access to the currently used data and data ranges - virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override; // X3DChartWindowProvider - virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr ) override; // XUpdatable - virtual void SAL_CALL update() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() override; // XDumper - virtual OUString SAL_CALL dump() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL dump() override; // normal methods css::uno::Reference< css::util::XNumberFormatsSupplier > const & diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index aa1e30949da1..a7b545f49af0 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -113,16 +113,12 @@ public: virtual ~ChartView() override; // ___lang::XServiceInfo___ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ___lang::XInitialization___ - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // ___ExplicitValueProvider___ virtual bool getExplicitValuesForAxis( @@ -139,68 +135,56 @@ public: std::shared_ptr< DrawModelWrapper > getDrawModelWrapper() override; // ___XTransferable___ - virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) - throw (css::datatransfer::UnsupportedFlavorException - , css::io::IOException - , css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) override; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override; // css::util::XEventListener (base of XCloseListener and XModifyListener) virtual void SAL_CALL - disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + disposing( const css::lang::EventObject& Source ) override; // css::util::XModifyListener virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // css::util::XModeChangeBroadcaster - virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) override; + virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) override; + virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) override; + virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) override; // css::util::XUpdatable - virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() override; // util::XUpdatable2 - virtual void SAL_CALL updateSoft() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateHard() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateSoft() override; + virtual void SAL_CALL updateHard() override; // css::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // css::lang::XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( - const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override; + const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; // for ExplicitValueProvider // ____ XUnoTunnel ___ - virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) override; // XDumper - virtual OUString SAL_CALL dump() - throw(css::uno::RuntimeException, - std::exception) override; + virtual OUString SAL_CALL dump() override; void setViewDirty(); void updateOpenGLWindow(); diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 64fef563a974..4759754b95a3 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -100,7 +100,6 @@ AccessibleBase::~AccessibleBase() } bool AccessibleBase::CheckDisposeState( bool bThrowException /* default: true */ ) const - throw (lang::DisposedException) { if( bThrowException && m_bIsDisposed ) @@ -188,7 +187,6 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId } void AccessibleBase::AddState( sal_Int16 aState ) - throw (RuntimeException) { CheckDisposeState(); OSL_ASSERT( m_xStateSetHelper.is() ); @@ -196,7 +194,6 @@ void AccessibleBase::AddState( sal_Int16 aState ) } void AccessibleBase::RemoveState( sal_Int16 aState ) - throw (RuntimeException) { CheckDisposeState(); OSL_ASSERT( m_xStateSetHelper.is() ); @@ -473,14 +470,12 @@ void SAL_CALL AccessibleBase::disposing() // ________ XAccessible ________ Reference< XAccessibleContext > SAL_CALL AccessibleBase::getAccessibleContext() - throw (RuntimeException, std::exception) { return this; } // ________ AccessibleBase::XAccessibleContext ________ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount() - throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( GetMutex() ); if( ! m_bMayHaveChildren || @@ -500,13 +495,11 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount() } sal_Int32 AccessibleBase::ImplGetAccessibleChildCount() const - throw (RuntimeException) { return m_aChildList.size(); } Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { CheckDisposeState(); Reference< XAccessible > xResult; @@ -526,7 +519,6 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 } Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i ) const - throw (lang::IndexOutOfBoundsException, RuntimeException) { Reference< XAccessible > xResult; @@ -550,7 +542,6 @@ Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i } Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent() - throw (RuntimeException, std::exception) { CheckDisposeState(); Reference< XAccessible > aResult; @@ -561,7 +552,6 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent() } sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent() - throw (RuntimeException, std::exception) { CheckDisposeState(); @@ -571,20 +561,17 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent() } sal_Int16 SAL_CALL AccessibleBase::getAccessibleRole() - throw (RuntimeException, std::exception) { return AccessibleRole::SHAPE; } Reference< XAccessibleRelationSet > SAL_CALL AccessibleBase::getAccessibleRelationSet() - throw (RuntimeException, std::exception) { Reference< XAccessibleRelationSet > aResult; return aResult; } Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet() - throw (RuntimeException, std::exception) { if( ! m_bStateSetInitialized ) { @@ -605,7 +592,6 @@ Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet( } lang::Locale SAL_CALL AccessibleBase::getLocale() - throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { CheckDisposeState(); @@ -614,7 +600,6 @@ lang::Locale SAL_CALL AccessibleBase::getLocale() // ________ AccessibleBase::XAccessibleComponent ________ sal_Bool SAL_CALL AccessibleBase::containsPoint( const awt::Point& aPoint ) - throw (RuntimeException, std::exception) { awt::Rectangle aRect( getBounds() ); @@ -629,7 +614,6 @@ sal_Bool SAL_CALL AccessibleBase::containsPoint( const awt::Point& aPoint ) } Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (RuntimeException, std::exception) { CheckDisposeState(); Reference< XAccessible > aResult; @@ -669,7 +653,6 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const aw } awt::Rectangle SAL_CALL AccessibleBase::getBounds() - throw (RuntimeException, std::exception) { ExplicitValueProvider *pExplicitValueProvider( ExplicitValueProvider::getExplicitValueProvider( m_aAccInfo.m_xView )); @@ -705,7 +688,6 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds() } awt::Point SAL_CALL AccessibleBase::getLocation() - throw (RuntimeException, std::exception) { CheckDisposeState(); awt::Rectangle aBBox( getBounds() ); @@ -713,7 +695,6 @@ awt::Point SAL_CALL AccessibleBase::getLocation() } awt::Point SAL_CALL AccessibleBase::getLocationOnScreen() - throw (RuntimeException, std::exception) { CheckDisposeState(); @@ -734,7 +715,6 @@ awt::Point SAL_CALL AccessibleBase::getLocationOnScreen() } awt::Size SAL_CALL AccessibleBase::getSize() - throw (RuntimeException, std::exception) { CheckDisposeState(); awt::Rectangle aBBox( getBounds() ); @@ -742,7 +722,6 @@ awt::Size SAL_CALL AccessibleBase::getSize() } void SAL_CALL AccessibleBase::grabFocus() - throw (RuntimeException, std::exception) { CheckDisposeState(); @@ -754,13 +733,11 @@ void SAL_CALL AccessibleBase::grabFocus() } sal_Int32 SAL_CALL AccessibleBase::getForeground() - throw (RuntimeException, std::exception) { return getColor( ACC_BASE_FOREGROUND ); } sal_Int32 SAL_CALL AccessibleBase::getBackground() - throw (RuntimeException, std::exception) { return getColor( ACC_BASE_BACKGROUND ); } @@ -859,19 +836,16 @@ sal_Int32 AccessibleBase::getColor( eColorType eColType ) // ________ AccessibleBase::XServiceInfo ________ OUString SAL_CALL AccessibleBase::getImplementationName() - throw (RuntimeException, std::exception) { return OUString( "AccessibleBase" ); } sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return { "com.sun.star.accessibility.Accessible", @@ -881,13 +855,11 @@ uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames() // ________ AccessibleBase::XEventListener ________ void SAL_CALL AccessibleBase::disposing( const lang::EventObject& /*Source*/ ) - throw (RuntimeException, std::exception) { } // ________ XAccessibleEventBroadcasters ________ void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -901,7 +873,6 @@ void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAcce } void SAL_CALL AccessibleBase::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index d94233a76c2e..b231b030c56a 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -115,7 +115,6 @@ void AccessibleChartElement::InitTextEdit() // ________ AccessibleBase::XAccessibleContext ________ Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal_Int32 i ) const - throw (lang::IndexOutOfBoundsException, RuntimeException) { Reference< XAccessible > xResult; @@ -128,7 +127,6 @@ Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal } sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const - throw (RuntimeException) { if( m_bHasText ) { @@ -142,14 +140,12 @@ sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const // ________ XServiceInfo ________ OUString SAL_CALL AccessibleChartElement::getImplementationName() - throw (RuntimeException, std::exception) { return OUString( "AccessibleChartElement" ); } // ________ AccessibleChartElement::XAccessibleContext (override) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleName() - throw (css::uno::RuntimeException, std::exception) { return ObjectNameProvider::getNameForCID( GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument ); @@ -157,14 +153,12 @@ OUString SAL_CALL AccessibleChartElement::getAccessibleName() // ________ AccessibleChartElement::XAccessibleContext (override) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { return getToolTipText(); } // ________ AccessibleChartElement::XAccessibleExtendedComponent ________ Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont() - throw (uno::RuntimeException, std::exception) { CheckDisposeState(); @@ -185,13 +179,11 @@ Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont() } OUString SAL_CALL AccessibleChartElement::getTitledBorderText() - throw (uno::RuntimeException, std::exception) { return OUString(); } OUString SAL_CALL AccessibleChartElement::getToolTipText() - throw (css::uno::RuntimeException, std::exception) { CheckDisposeState(); @@ -201,55 +193,46 @@ OUString SAL_CALL AccessibleChartElement::getToolTipText() // ________ XAccessibleComponent ________ sal_Bool SAL_CALL AccessibleChartElement::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { return AccessibleBase::containsPoint( aPoint ); } Reference< XAccessible > SAL_CALL AccessibleChartElement::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getAccessibleAtPoint( aPoint ); } awt::Rectangle SAL_CALL AccessibleChartElement::getBounds() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getBounds(); } awt::Point SAL_CALL AccessibleChartElement::getLocation() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getLocation(); } awt::Point SAL_CALL AccessibleChartElement::getLocationOnScreen() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getLocationOnScreen(); } awt::Size SAL_CALL AccessibleChartElement::getSize() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getSize(); } void SAL_CALL AccessibleChartElement::grabFocus() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::grabFocus(); } sal_Int32 SAL_CALL AccessibleChartElement::getForeground() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getForeground(); } sal_Int32 SAL_CALL AccessibleChartElement::getBackground() - 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 58db7bd12501..a2e48d64ad87 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -75,44 +75,35 @@ public: // ________ AccessibleBase ________ virtual bool ImplUpdateChildren() override; virtual css::uno::Reference< css::accessibility::XAccessible > - ImplGetAccessibleChildById( sal_Int32 i ) const - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) override; - virtual sal_Int32 ImplGetAccessibleChildCount() const - throw (css::uno::RuntimeException) override; + ImplGetAccessibleChildById( sal_Int32 i ) const override; + virtual sal_Int32 ImplGetAccessibleChildCount() const override; // ________ XAccessibleContext ________ - virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName() override; + virtual OUString SAL_CALL getAccessibleDescription() override; // ________ XAccessibleExtendedComponent ________ - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override; + virtual OUString SAL_CALL getTitledBorderText() override; + virtual OUString SAL_CALL getToolTipText() override; // the following interface is implemented in AccessibleBase, however it is // also a (non-virtual) base class of XAccessibleExtendedComponent Thus // these methods have to be overridden and forward to AccessibleBase // ________ XAccessibleComponent ________ - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; + virtual css::awt::Point SAL_CALL getLocation() override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL grabFocus() override; + virtual sal_Int32 SAL_CALL getForeground() override; + virtual sal_Int32 SAL_CALL getBackground() override; // ________ XServiceInfo ________ - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; private: bool m_bHasText; diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index 3139f9dd66d2..2757cef19cb2 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -75,14 +75,12 @@ AccessibleChartShape::~AccessibleChartShape() // ________ XServiceInfo ________ OUString AccessibleChartShape::getImplementationName() - throw (RuntimeException, std::exception) { return OUString( "AccessibleChartShape" ); } // ________ XAccessibleContext ________ sal_Int32 AccessibleChartShape::getAccessibleChildCount() - throw (RuntimeException, std::exception) { sal_Int32 nCount(0); if ( m_pAccShape.is() ) @@ -93,7 +91,6 @@ sal_Int32 AccessibleChartShape::getAccessibleChildCount() } Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { Reference< XAccessible > xChild; if ( m_pAccShape.is() ) @@ -104,7 +101,6 @@ Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i ) } sal_Int16 AccessibleChartShape::getAccessibleRole() - throw (RuntimeException, std::exception) { sal_Int16 nRole(0); if ( m_pAccShape.is() ) @@ -115,7 +111,6 @@ sal_Int16 AccessibleChartShape::getAccessibleRole() } OUString AccessibleChartShape::getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { OUString aDescription; if ( m_pAccShape.is() ) @@ -126,7 +121,6 @@ OUString AccessibleChartShape::getAccessibleDescription() } OUString AccessibleChartShape::getAccessibleName() - throw (css::uno::RuntimeException, std::exception) { OUString aName; if ( m_pAccShape.is() ) @@ -138,7 +132,6 @@ OUString AccessibleChartShape::getAccessibleName() // ________ XAccessibleComponent ________ sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { bool bReturn = false; if ( m_pAccShape.is() ) @@ -149,7 +142,6 @@ sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint ) } Reference< XAccessible > AccessibleChartShape::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { Reference< XAccessible > xResult; if ( m_pAccShape.is() ) @@ -160,7 +152,6 @@ Reference< XAccessible > AccessibleChartShape::getAccessibleAtPoint( const awt:: } awt::Rectangle AccessibleChartShape::getBounds() - throw (uno::RuntimeException, std::exception) { awt::Rectangle aBounds; if ( m_pAccShape.is() ) @@ -171,7 +162,6 @@ awt::Rectangle AccessibleChartShape::getBounds() } awt::Point AccessibleChartShape::getLocation() - throw (uno::RuntimeException, std::exception) { awt::Point aLocation; if ( m_pAccShape.is() ) @@ -182,7 +172,6 @@ awt::Point AccessibleChartShape::getLocation() } awt::Point AccessibleChartShape::getLocationOnScreen() - throw (uno::RuntimeException, std::exception) { awt::Point aLocation; if ( m_pAccShape.is() ) @@ -193,7 +182,6 @@ awt::Point AccessibleChartShape::getLocationOnScreen() } awt::Size AccessibleChartShape::getSize() - throw (uno::RuntimeException, std::exception) { awt::Size aSize; if ( m_pAccShape.is() ) @@ -204,13 +192,11 @@ awt::Size AccessibleChartShape::getSize() } void AccessibleChartShape::grabFocus() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::grabFocus(); } sal_Int32 AccessibleChartShape::getForeground() - throw (uno::RuntimeException, std::exception) { sal_Int32 nColor(0); if ( m_pAccShape.is() ) @@ -221,7 +207,6 @@ sal_Int32 AccessibleChartShape::getForeground() } sal_Int32 AccessibleChartShape::getBackground() - throw (uno::RuntimeException, std::exception) { sal_Int32 nColor(0); if ( m_pAccShape.is() ) @@ -233,7 +218,6 @@ sal_Int32 AccessibleChartShape::getBackground() // ________ XAccessibleExtendedComponent ________ Reference< awt::XFont > AccessibleChartShape::getFont() - throw (uno::RuntimeException, std::exception) { Reference< awt::XFont > xFont; if ( m_pAccShape.is() ) @@ -244,7 +228,6 @@ Reference< awt::XFont > AccessibleChartShape::getFont() } OUString AccessibleChartShape::getTitledBorderText() - throw (uno::RuntimeException, std::exception) { OUString aText; if ( m_pAccShape.is() ) @@ -255,7 +238,6 @@ OUString AccessibleChartShape::getTitledBorderText() } OUString AccessibleChartShape::getToolTipText() - throw (css::uno::RuntimeException, std::exception) { OUString aText; if ( m_pAccShape.is() ) diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index 3108b18fd95d..6feaf9e295b9 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -48,41 +48,31 @@ public: virtual ~AccessibleChartShape() override; // ________ XServiceInfo ________ - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; // ________ XAccessibleContext ________ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 i ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChild( sal_Int32 i ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; + virtual OUString SAL_CALL getAccessibleDescription() override; + virtual OUString SAL_CALL getAccessibleName() override; // ________ XAccessibleComponent ________ - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; + virtual css::awt::Point SAL_CALL getLocation() override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL grabFocus() override; + virtual sal_Int32 SAL_CALL getForeground() override; + virtual sal_Int32 SAL_CALL getBackground() override; // ________ XAccessibleExtendedComponent ________ - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override; + virtual OUString SAL_CALL getTitledBorderText() override; + virtual OUString SAL_CALL getToolTipText() override; private: rtl::Reference<accessibility::AccessibleShape> m_pAccShape; diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index fac65a65c301..77c4457651a9 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -98,39 +98,33 @@ awt::Point AccessibleChartView::GetUpperLeftOnScreen() const // ________ XAccessibleContext ________ OUString SAL_CALL AccessibleChartView::getAccessibleName() - throw (uno::RuntimeException, std::exception) { return SCH_RESSTR(STR_OBJECT_DIAGRAM); } OUString SAL_CALL AccessibleChartView::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { return getAccessibleName(); } Reference< XAccessible > SAL_CALL AccessibleChartView::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { return Reference< XAccessible >( m_xParent ); } sal_Int32 SAL_CALL AccessibleChartView::getAccessibleIndexInParent() - 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, std::exception) { return AccessibleRole::DOCUMENT; } // ________ XAccessibleComponent ________ awt::Rectangle SAL_CALL AccessibleChartView::getBounds() - throw (uno::RuntimeException, std::exception) { awt::Rectangle aResult( GetWindowPosSize()); Reference< XAccessible > xParent( m_xParent ); @@ -148,7 +142,6 @@ awt::Rectangle SAL_CALL AccessibleChartView::getBounds() } awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen() - throw (uno::RuntimeException, std::exception) { awt::Rectangle aBounds( getBounds()); awt::Point aResult; @@ -167,7 +160,6 @@ awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen() // lang::XInitialization void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments ) - 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 @@ -334,7 +326,6 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments // view::XSelectionChangeListener void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /*rEvent*/ ) - throw (uno::RuntimeException, std::exception) { Reference< view::XSelectionSupplier > xSelectionSupplier; { @@ -359,7 +350,6 @@ void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /* // XEventListener void SAL_CALL AccessibleChartView::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 367c098c73b9..6276daf18d2e 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -57,8 +57,6 @@ AccessibleTextHelper::~AccessibleTextHelper() // ____ XInitialization ____ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArguments ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { OUString aCID; Reference< XAccessible > xEventSource; @@ -100,7 +98,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg // ____ XAccessibleContext ____ ::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { if( m_pTextHelper ) { @@ -111,8 +108,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg } Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( m_pTextHelper ) { @@ -123,57 +118,48 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sa } Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return Reference< XAccessible >(); } ::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleIndexInParent() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return -1; } ::sal_Int16 SAL_CALL AccessibleTextHelper::getAccessibleRole() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return AccessibleRole::UNKNOWN; } OUString SAL_CALL AccessibleTextHelper::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return OUString(); } OUString SAL_CALL AccessibleTextHelper::getAccessibleName() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return OUString(); } Reference< XAccessibleRelationSet > SAL_CALL AccessibleTextHelper::getAccessibleRelationSet() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return Reference< XAccessibleRelationSet >(); } Reference< XAccessibleStateSet > SAL_CALL AccessibleTextHelper::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return Reference< XAccessibleStateSet >(); } lang::Locale SAL_CALL AccessibleTextHelper::getLocale() - throw (IllegalAccessibleComponentStateException, - 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 69c9183bae25..d18d405eadf0 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -84,40 +84,33 @@ AreaWrapper::~AreaWrapper() // ____ XShape ____ awt::Point SAL_CALL AreaWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { return awt::Point(0,0); } void SAL_CALL AreaWrapper::setPosition( const awt::Point& /*aPosition*/ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set position of chart area" ); } awt::Size SAL_CALL AreaWrapper::getSize() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetPageSize(); } void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ ) - throw (beans::PropertyVetoException, - 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, std::exception) { return OUString( "com.sun.star.chart.ChartArea" ); } // ____ XComponent ____ void SAL_CALL AreaWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -128,14 +121,12 @@ void SAL_CALL AreaWrapper::dispose() void SAL_CALL AreaWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL AreaWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -165,19 +156,16 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties() } OUString SAL_CALL AreaWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Area"); } sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.xml.UserDefinedAttributesSupplier", diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index de77aafe0472..bd5fad7298a1 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -51,37 +51,25 @@ public: virtual ~AreaWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XShape ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index cfab846edcd3..a7b088083ff8 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -412,7 +412,7 @@ AxisWrapper::~AxisWrapper() } // ____ chart::XAxis ____ -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno::RuntimeException, std::exception) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() { if( !m_xAxisTitle.is() ) { @@ -441,7 +441,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno } return m_xAxisTitle; } -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno::RuntimeException, std::exception) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() { if( !m_xMajorGrid.is() ) { @@ -464,7 +464,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno } return m_xMajorGrid; } -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno::RuntimeException, std::exception) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() { if( !m_xMinorGrid.is() ) { @@ -490,42 +490,35 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno // ____ XShape ____ awt::Point SAL_CALL AxisWrapper::getPosition() - 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, std::exception) { OSL_FAIL( "trying to set position of Axis" ); } awt::Size SAL_CALL AxisWrapper::getSize() - throw (uno::RuntimeException, std::exception) { awt::Size aSize( m_spChart2ModelContact->GetAxisSize( this->getAxis() ) ); return aSize; } void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set size of Axis" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL AxisWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString("com.sun.star.chart.ChartAxis"); } // ____ XNumberFormatsSupplier ____ uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSettings() - throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY ); if( xNumSuppl.is() ) @@ -535,7 +528,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSetti } uno::Reference< util::XNumberFormats > SAL_CALL AxisWrapper::getNumberFormats() - throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY ); if( xNumSuppl.is() ) @@ -563,7 +555,6 @@ void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDim // ____ XComponent ____ void SAL_CALL AxisWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -577,14 +568,12 @@ void SAL_CALL AxisWrapper::dispose() void SAL_CALL AxisWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL AxisWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -691,19 +680,16 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties() } OUString SAL_CALL AxisWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Axis"); } sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL AxisWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartAxis", diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 352778b8f0b3..4adc3b77ff36 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -67,12 +67,9 @@ public: static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis ); /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; @@ -80,42 +77,31 @@ public: virtual css::awt::Size getCurrentSizeForReference() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; // ____ chart::XAxis ____ - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getAxisTitle( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMajorGrid( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinorGrid( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getAxisTitle( ) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMajorGrid( ) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinorGrid( ) override; // ____ XShape ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XNumberFormatsSupplier ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() override; virtual css::uno::Reference< - css::util::XNumberFormats > SAL_CALL getNumberFormats() - throw (css::uno::RuntimeException, std::exception) override; + css::util::XNumberFormats > SAL_CALL getNumberFormats() override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 2378a1d579bf..705f9fc2eb1e 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -413,7 +413,6 @@ ChartDataWrapper::~ChartDataWrapper() // ____ XChartDataArray (read)____ Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData() - throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -421,7 +420,6 @@ Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData() return Sequence< Sequence< double > >(); } Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions() - throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -429,7 +427,6 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions() return Sequence< OUString >(); } Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions() - throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -438,14 +435,14 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions() } // ____ XComplexDescriptionAccess (read) ____ -Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() { initDataAccess(); if( m_xDataAccess.is() ) return m_xDataAccess->getComplexRowDescriptions(); return Sequence< Sequence< OUString > >(); } -Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions() { initDataAccess(); if( m_xDataAccess.is() ) @@ -454,14 +451,14 @@ Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDesc } // ____ XAnyDescriptionAccess (read) ____ -Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() { 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, std::exception) +Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions() { initDataAccess(); if( m_xDataAccess.is() ) @@ -470,7 +467,7 @@ Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescript } // ____ XDateCategories (read) ____ -Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::RuntimeException, std::exception) +Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() { initDataAccess(); Reference< XDateCategories > xDateCategories( m_xDataAccess, uno::UNO_QUERY ); @@ -481,50 +478,47 @@ Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::Ru // ____ XChartDataArray (write)____ void SAL_CALL ChartDataWrapper::setData( const Sequence< Sequence< double > >& rData ) - throw (uno::RuntimeException, std::exception) { lcl_DataOperator aOperator( rData ); applyData( aOperator ); } void SAL_CALL ChartDataWrapper::setRowDescriptions( const Sequence< OUString >& rRowDescriptions ) - 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, 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, std::exception) +void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& rRowDescriptions ) { lcl_ComplexRowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } -void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions ) { 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, std::exception) +void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions ) { lcl_AnyRowDescriptionsOperator aOperator( rRowDescriptions ); applyData( aOperator ); } -void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) { lcl_AnyColumnDescriptionsOperator aOperator( rColumnDescriptions ); applyData( aOperator ); } // ____ XDateCategories (write) ____ -void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); ControllerLockGuardUNO aCtrlLockGuard( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY )); @@ -536,26 +530,22 @@ void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDa // ____ XChartData (base of XChartDataArray) ____ void SAL_CALL ChartDataWrapper::addChartDataChangeEventListener( const uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( aListener ); } void SAL_CALL ChartDataWrapper::removeChartDataChangeEventListener( const uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } double SAL_CALL ChartDataWrapper::getNotANumber() - throw (uno::RuntimeException, std::exception) { return DBL_MIN; } sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber ) - throw (uno::RuntimeException, std::exception) { return DBL_MIN == nNumber || ::rtl::math::isNan( nNumber ) @@ -564,7 +554,6 @@ sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber ) // ____ XComponent ____ void SAL_CALL ChartDataWrapper::dispose() - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this ))); m_xDataAccess=nullptr; @@ -572,21 +561,18 @@ void SAL_CALL ChartDataWrapper::dispose() void SAL_CALL ChartDataWrapper::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL ChartDataWrapper::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } // ____ XEventListener ____ void SAL_CALL ChartDataWrapper::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { } @@ -702,19 +688,16 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) } OUString SAL_CALL ChartDataWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ChartData"); } sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartDataWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartDataArray", diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 34a35ee7643b..a15a2d06ab70 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -54,77 +54,56 @@ public: virtual ~ChartDataWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: // ____ XDateCategories ____ - virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL getDateCategories() override; + virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) override; // ____ XAnyDescriptionAccess ____ virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL - getAnyRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getAnyRowDescriptions() override; virtual void SAL_CALL setAnyRowDescriptions( - const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) override; virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL - getAnyColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getAnyColumnDescriptions() override; virtual void SAL_CALL setAnyColumnDescriptions( - const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) override; // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL - getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getComplexRowDescriptions() override; virtual void SAL_CALL setComplexRowDescriptions( - const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) override; virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL - getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getComplexColumnDescriptions() override; virtual void SAL_CALL setComplexColumnDescriptions( - const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) override; // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ - virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() override; + virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() override; + virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) override; // ____ XChartData (base of XChartDataArray) ____ - virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getNotANumber() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override; + virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override; + virtual double SAL_CALL getNotANumber() override; + virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // ____ XEventListener ____ - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; void fireChartDataChangeEvent( css::chart::ChartDataChangeEvent& aEvent ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 4f46ea84cb16..f98a743814c4 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -273,14 +273,11 @@ class WrappedDataSourceLabelsInFirstRowProperty : public WrappedProperty public: explicit WrappedDataSourceLabelsInFirstRowProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -296,7 +293,6 @@ WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProp } void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bLabelsInFirstRow = true; if( ! (rOuterValue >>= bLabelsInFirstRow) ) @@ -329,7 +325,6 @@ void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOu } Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OUString aRangeString; bool bUseColumns = true; @@ -353,7 +348,6 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference } Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= true; @@ -366,14 +360,11 @@ class WrappedDataSourceLabelsInFirstColumnProperty : public WrappedProperty public: explicit WrappedDataSourceLabelsInFirstColumnProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -389,7 +380,6 @@ WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColu } void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bLabelsInFirstRow = true; if( ! (rOuterValue >>= bLabelsInFirstRow) ) @@ -422,7 +412,6 @@ void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& } Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OUString aRangeString; bool bUseColumns = true; @@ -446,7 +435,6 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Refere } Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= true; @@ -459,14 +447,11 @@ class WrappedHasLegendProperty : public WrappedProperty public: explicit WrappedHasLegendProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -479,7 +464,6 @@ WrappedHasLegendProperty::WrappedHasLegendProperty(const std::shared_ptr<Chart2M } void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) @@ -505,7 +489,6 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R } Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; try @@ -525,7 +508,6 @@ Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropert } Any WrappedHasLegendProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -538,14 +520,11 @@ class WrappedHasMainTitleProperty : public WrappedProperty public: explicit WrappedHasMainTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -558,7 +537,6 @@ WrappedHasMainTitleProperty::WrappedHasMainTitleProperty(const std::shared_ptr<C } void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) @@ -578,7 +556,6 @@ void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, cons } Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; try @@ -593,7 +570,6 @@ Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XProp } Any WrappedHasMainTitleProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -606,14 +582,11 @@ class WrappedHasSubTitleProperty : public WrappedProperty public: explicit WrappedHasSubTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -626,7 +599,6 @@ WrappedHasSubTitleProperty::WrappedHasSubTitleProperty(const std::shared_ptr<Cha } void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) @@ -646,7 +618,6 @@ void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const } Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; try @@ -661,7 +632,6 @@ Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPrope } Any WrappedHasSubTitleProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -683,7 +653,6 @@ ChartDocumentWrapper::~ChartDocumentWrapper() // ____ XInterface (for new interfaces) ____ uno::Any SAL_CALL ChartDocumentWrapper::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException, std::exception) { if( m_xDelegator.is()) // calls queryAggregation if the delegator doesn't know aType @@ -694,7 +663,6 @@ 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, std::exception) { if( !m_xTitle.is() ) { @@ -705,7 +673,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle() } Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle() - throw (uno::RuntimeException, std::exception) { if( !m_xSubTitle.is() ) { @@ -716,7 +683,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle() } Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend() - throw (uno::RuntimeException, std::exception) { if( ! m_xLegend.is()) { @@ -728,7 +694,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend() } Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea() - throw (uno::RuntimeException, std::exception) { if( ! m_xArea.is()) { @@ -740,7 +705,6 @@ Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea() } Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram() - throw (uno::RuntimeException, std::exception) { if( !m_xDiagram.is() ) { @@ -758,7 +722,6 @@ Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram() } void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { uno::Reference< util::XRefreshable > xAddIn( xDiagram, uno::UNO_QUERY ); if( xAddIn.is() ) @@ -791,7 +754,6 @@ void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDi } Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData() - throw (uno::RuntimeException, std::exception) { if( !m_xChartData.is() ) { @@ -803,7 +765,6 @@ Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData() } void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& xNewData ) - throw (uno::RuntimeException, std::exception) { if( !xNewData.is() ) return; @@ -816,7 +777,6 @@ 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, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -825,7 +785,6 @@ sal_Bool SAL_CALL ChartDocumentWrapper::attachResource( } OUString SAL_CALL ChartDocumentWrapper::getURL() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -834,7 +793,6 @@ OUString SAL_CALL ChartDocumentWrapper::getURL() } Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -843,7 +801,6 @@ Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs() } void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::XController >& Controller ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -852,7 +809,6 @@ void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::X void SAL_CALL ChartDocumentWrapper::disconnectController( const Reference< frame::XController >& Controller ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -860,7 +816,6 @@ void SAL_CALL ChartDocumentWrapper::disconnectController( } void SAL_CALL ChartDocumentWrapper::lockControllers() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -868,7 +823,6 @@ void SAL_CALL ChartDocumentWrapper::lockControllers() } void SAL_CALL ChartDocumentWrapper::unlockControllers() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -876,7 +830,6 @@ void SAL_CALL ChartDocumentWrapper::unlockControllers() } sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -885,7 +838,6 @@ sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked() } Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentController() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -895,8 +847,6 @@ Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentControl void SAL_CALL ChartDocumentWrapper::setCurrentController( const Reference< frame::XController >& Controller ) - throw (container::NoSuchElementException, - uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -904,7 +854,6 @@ void SAL_CALL ChartDocumentWrapper::setCurrentController( } Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -914,7 +863,6 @@ Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection( // ____ XComponent ____ void SAL_CALL ChartDocumentWrapper::dispose() - throw (uno::RuntimeException, std::exception) { if( m_bIsDisposed ) throw lang::DisposedException("ChartDocumentWrapper is disposed", @@ -1074,7 +1022,6 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const } void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -1082,7 +1029,6 @@ void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEv } void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -1091,13 +1037,11 @@ void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang:: // ____ XDrawPageSupplier ____ uno::Reference< drawing::XDrawPage > SAL_CALL ChartDocumentWrapper::getDrawPage() - throw (uno::RuntimeException, std::exception) { return this->impl_getDrawPage(); } uno::Reference< drawing::XDrawPage > ChartDocumentWrapper::impl_getDrawPage() const - throw (uno::RuntimeException) { return m_spChart2ModelContact->getDrawPage(); } @@ -1123,8 +1067,6 @@ uno::Reference< lang::XMultiServiceFactory > getShapeFactory(const uno::Referenc // ____ XMultiServiceFactory ____ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( const OUString& aServiceSpecifier ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; @@ -1411,8 +1353,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { OSL_ENSURE( Arguments.getLength(), "createInstanceWithArguments: Warning: Arguments are ignored" ); (void)(Arguments); @@ -1421,7 +1361,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceW } uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceNames() - throw (uno::RuntimeException, std::exception) { return comphelper::mapKeysToSequence( lcl_getStaticServiceNameMap() ); } @@ -1429,7 +1368,6 @@ uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceName // ____ XAggregation ____ void SAL_CALL ChartDocumentWrapper::setDelegator( const uno::Reference< uno::XInterface >& rDelegator ) - throw (uno::RuntimeException, std::exception) { if( m_bIsDisposed ) { @@ -1460,7 +1398,6 @@ void SAL_CALL ChartDocumentWrapper::setDelegator( } uno::Any SAL_CALL ChartDocumentWrapper::queryAggregation( const uno::Type& rType ) - throw (uno::RuntimeException, std::exception) { return ChartDocumentWrapper_Base::queryInterface( rType ); } @@ -1516,19 +1453,16 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert } OUString SAL_CALL ChartDocumentWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartDocumentWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartDocument", diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index a480d30057df..f83bc35c5cc8 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -259,14 +259,11 @@ class WrappedAttachedAxisProperty : public ::chart::WrappedProperty public: explicit WrappedAttachedAxisProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -280,7 +277,6 @@ WrappedAttachedAxisProperty::WrappedAttachedAxisProperty( } Any WrappedAttachedAxisProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= css::chart::ChartAxisAssign::PRIMARY_Y; @@ -288,7 +284,6 @@ Any WrappedAttachedAxisProperty::getPropertyDefault( const Reference< beans::XPr } Any WrappedAttachedAxisProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; @@ -302,7 +297,6 @@ Any WrappedAttachedAxisProperty::getPropertyValue( const Reference< beans::XProp } void WrappedAttachedAxisProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { uno::Reference< chart2::XDataSeries > xDataSeries( xInnerPropertySet, uno::UNO_QUERY ); @@ -364,14 +358,11 @@ class WrappedLineColorProperty : public WrappedSeriesAreaOrLineProperty public: explicit WrappedLineColorProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper ); - virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; @@ -389,7 +380,6 @@ WrappedLineColorProperty::WrappedLineColorProperty( } void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) m_aOuterValue = rOuterValue; @@ -398,7 +388,6 @@ void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const R } void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) m_aOuterValue = m_aDefaultValue; @@ -407,7 +396,6 @@ void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPr } Any WrappedLineColorProperty::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { if( m_pDataSeriesPointWrapper && !m_pDataSeriesPointWrapper->isSupportingAreaProperties() ) return m_aDefaultValue; @@ -420,11 +408,9 @@ class WrappedLineStyleProperty : public WrappedSeriesAreaOrLineProperty public: explicit WrappedLineStyleProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper ); - virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; @@ -442,7 +428,6 @@ WrappedLineStyleProperty::WrappedLineStyleProperty( } void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { Any aNewValue(rOuterValue); if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) @@ -454,7 +439,6 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R } void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) m_aOuterValue = m_aDefaultValue; @@ -482,7 +466,6 @@ DataSeriesPointWrapper::DataSeriesPointWrapper(const std::shared_ptr<Chart2Model } void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any >& aArguments ) - 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"); @@ -527,7 +510,6 @@ DataSeriesPointWrapper::~DataSeriesPointWrapper() // ____ XComponent ____ void SAL_CALL DataSeriesPointWrapper::dispose() - throw (uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -538,21 +520,18 @@ void SAL_CALL DataSeriesPointWrapper::dispose() void SAL_CALL DataSeriesPointWrapper::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL DataSeriesPointWrapper::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } // ____ XEventListener ____ void SAL_CALL DataSeriesPointWrapper::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException, std::exception) { } @@ -623,7 +602,6 @@ awt::Size DataSeriesPointWrapper::getCurrentSizeForReference() //XPropertyState beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); try @@ -688,7 +666,6 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU } void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( m_eType == DATA_SERIES ) WrappedPropertySet::setPropertyToDefault( rPropertyName ); @@ -699,7 +676,6 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPro } } Any SAL_CALL DataSeriesPointWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; try @@ -800,7 +776,6 @@ 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, std::exception) { if(rPropertyName == "Lines") { @@ -861,7 +836,6 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert } Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rPropertyName ) - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( m_eType == DATA_POINT ) { @@ -890,19 +864,16 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty } OUString SAL_CALL DataSeriesPointWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.DataSeries"); } sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DataSeriesPointWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartDataRowProperties", diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index c2bcf4ea3cdc..6f3120b40502 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -73,16 +73,12 @@ public: bool isLinesForbidden() { return !m_bLinesAllowed;} /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ___lang::XInitialization___ - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; @@ -91,28 +87,24 @@ public: protected: // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // ____ XEventListener ____ - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; protected: // ____ WrappedPropertySet ____ virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual const std::vector< WrappedProperty* > createWrappedProperties() override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; //own methods css::uno::Reference< css::chart2::XDataSeries > getDataSeries(); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 2d33bf349f8e..ffb4fd92f2ff 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -635,7 +635,6 @@ DiagramWrapper::~DiagramWrapper() // ____ XDiagram ____ OUString SAL_CALL DiagramWrapper::getDiagramType() - throw (uno::RuntimeException, std::exception) { OUString aRet; @@ -682,8 +681,6 @@ OUString SAL_CALL DiagramWrapper::getDiagramType() Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDataRowProperties( sal_Int32 nRow ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( nRow < 0 ) throw lang::IndexOutOfBoundsException("DataSeries index invalid", @@ -703,8 +700,6 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( nCol < 0 || nRow < 0 ) throw lang::IndexOutOfBoundsException("DataSeries index invalid", @@ -727,14 +722,12 @@ Reference< // ____ XShape (base of XDiagram) ____ awt::Point SAL_CALL DiagramWrapper::getPosition() - 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, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); @@ -759,15 +752,12 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL DiagramWrapper::getSize() - throw (uno::RuntimeException, std::exception) { awt::Size aSize = ToSize( m_spChart2ModelContact->GetDiagramRectangleIncludingAxes() ); return aSize; } void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); @@ -794,14 +784,13 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL DiagramWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.Diagram" ); } // ____ XDiagramPositioning ____ -void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::RuntimeException, std::exception) +void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); @@ -811,7 +800,7 @@ void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::Runti xDiaProps->setPropertyValue( "RelativePosition", Any() ); } } -sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) { uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) @@ -823,7 +812,7 @@ sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) throw (uno:: } return true; } -void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect ) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect ); @@ -831,7 +820,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, std::exception) +sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() { uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) @@ -847,11 +836,11 @@ sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::Ru } return false; } -awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes( ) throw (uno::RuntimeException, std::exception) +awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes( ) { return m_spChart2ModelContact->GetDiagramRectangleExcludingAxes(); } -void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect ) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect ); @@ -859,24 +848,23 @@ 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, std::exception) +awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes( ) { return m_spChart2ModelContact->GetDiagramRectangleIncludingAxes(); } -void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect ) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); awt::Rectangle aRect( m_spChart2ModelContact->SubstractAxisTitleSizes(rPositionRect) ); DiagramWrapper::setDiagramPositionIncludingAxes( aRect ); } -css::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (css::uno::RuntimeException, std::exception) +css::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) { return m_spChart2ModelContact->GetDiagramRectangleIncludingTitle(); } // ____ XAxisSupplier ____ Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex ) - throw (uno::RuntimeException, std::exception) { Reference< XAxis > xAxis; if(!nDimensionIndex) @@ -901,7 +889,6 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex ) } Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensionIndex ) - throw (uno::RuntimeException, std::exception) { Reference< XAxis > xAxis; if(!nDimensionIndex) @@ -921,7 +908,6 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensi // ____ XAxisZSupplier ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -931,7 +917,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -941,7 +926,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -951,7 +935,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xZAxis.is()) m_xZAxis = new AxisWrapper( AxisWrapper::Z_AXIS, m_spChart2ModelContact ); @@ -960,7 +943,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis() // ____ XTwoAxisXSupplier ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xSecondXAxis.is()) m_xSecondXAxis = new AxisWrapper( AxisWrapper::SECOND_X_AXIS, m_spChart2ModelContact ); @@ -969,7 +951,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis() // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -979,7 +960,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xXAxis.is()) m_xXAxis = new AxisWrapper( AxisWrapper::X_AXIS, m_spChart2ModelContact ); @@ -987,7 +967,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -997,7 +976,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -1008,7 +986,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid() // ____ XTwoAxisYSupplier ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xSecondYAxis.is()) m_xSecondYAxis = new AxisWrapper( AxisWrapper::SECOND_Y_AXIS, m_spChart2ModelContact ); @@ -1017,7 +994,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis() // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1027,7 +1003,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xYAxis.is()) m_xYAxis = new AxisWrapper( AxisWrapper::Y_AXIS, m_spChart2ModelContact ); @@ -1035,7 +1010,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1045,7 +1019,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1056,7 +1029,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid() // ____ XSecondAxisTitleSupplier ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getSecondaryAxis(0) ); @@ -1066,7 +1038,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle() } Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getSecondaryAxis(1) ); @@ -1078,7 +1049,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle() // ____ XStatisticDisplay ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getUpBar() - throw (uno::RuntimeException, std::exception) { if( !m_xUpBarWrapper.is() ) { @@ -1089,7 +1059,6 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDownBar() - throw (uno::RuntimeException, std::exception) { if( !m_xDownBarWrapper.is() ) { @@ -1100,7 +1069,6 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getMinMaxLine() - throw (uno::RuntimeException, std::exception) { if( !m_xMinMaxLineWrapper.is() ) { @@ -1111,7 +1079,6 @@ Reference< // ____ X3DDisplay ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall() - throw (uno::RuntimeException, std::exception) { if( !m_xWall.is() ) { @@ -1122,7 +1089,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall() Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getFloor() - throw (uno::RuntimeException, std::exception) { if( !m_xFloor.is() ) { @@ -1133,7 +1099,6 @@ Reference< // ____ X3DDefaultSetter ____ void SAL_CALL DiagramWrapper::set3DSettingsToDefault() - throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1141,7 +1106,6 @@ void SAL_CALL DiagramWrapper::set3DSettingsToDefault() } void SAL_CALL DiagramWrapper::setDefaultRotation() - throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1149,7 +1113,6 @@ void SAL_CALL DiagramWrapper::setDefaultRotation() } void SAL_CALL DiagramWrapper::setDefaultIllumination() - throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1158,7 +1121,6 @@ void SAL_CALL DiagramWrapper::setDefaultIllumination() // ____ XComponent ____ void SAL_CALL DiagramWrapper::dispose() - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this ))); @@ -1180,14 +1142,12 @@ void SAL_CALL DiagramWrapper::dispose() void SAL_CALL DiagramWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL DiagramWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -1198,14 +1158,11 @@ class WrappedDataRowSourceProperty : public WrappedProperty public: explicit WrappedDataRowSourceProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1221,7 +1178,6 @@ WrappedDataRowSourceProperty::WrappedDataRowSourceProperty(const std::shared_ptr } void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { css::chart::ChartDataRowSource eChartDataRowSource = css::chart::ChartDataRowSource_ROWS; if( ! (rOuterValue >>= eChartDataRowSource) ) @@ -1257,7 +1213,6 @@ void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, con } Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OUString aRangeString; bool bUseColumns = true; @@ -1280,7 +1235,6 @@ Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPro } Any WrappedDataRowSourceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= css::chart::ChartDataRowSource_COLUMNS; @@ -1295,14 +1249,11 @@ class WrappedStackingProperty : public WrappedProperty public: WrappedStackingProperty(StackMode eStackMode, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: //methods bool detectInnerValue( StackMode& eInnerStackMode ) const; @@ -1346,7 +1297,6 @@ bool WrappedStackingProperty::detectInnerValue( StackMode& eStackMode ) const } void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -1375,7 +1325,6 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re } Any WrappedStackingProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { StackMode eInnerStackMode; if( detectInnerValue( eInnerStackMode ) ) @@ -1387,7 +1336,6 @@ Any WrappedStackingProperty::getPropertyValue( const Reference< beans::XProperty } Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -1400,14 +1348,11 @@ class WrappedDim3DProperty : public WrappedProperty public: explicit WrappedDim3DProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1423,7 +1368,6 @@ WrappedDim3DProperty::WrappedDim3DProperty(const std::shared_ptr<Chart2ModelCont } void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNew3D = false; if( ! (rOuterValue >>= bNew3D) ) @@ -1441,7 +1385,6 @@ void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Refer } Any WrappedDim3DProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) @@ -1453,7 +1396,6 @@ Any WrappedDim3DProperty::getPropertyValue( const Reference< beans::XPropertySet } Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -1466,14 +1408,11 @@ class WrappedVerticalProperty : public WrappedProperty public: explicit WrappedVerticalProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1489,7 +1428,6 @@ WrappedVerticalProperty::WrappedVerticalProperty(const std::shared_ptr<Chart2Mod } void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewVertical = false; if( ! (rOuterValue >>= bNewVertical) ) @@ -1509,7 +1447,6 @@ void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Re } Any WrappedVerticalProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) @@ -1524,7 +1461,6 @@ Any WrappedVerticalProperty::getPropertyValue( const Reference< beans::XProperty } Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -1537,14 +1473,11 @@ class WrappedNumberOfLinesProperty : public WrappedProperty public: explicit WrappedNumberOfLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: //methods bool detectInnerValue( uno::Any& rInnerValue ) const; @@ -1597,7 +1530,6 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con } void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nNewValue; if( ! (rOuterValue >>= nNewValue) ) @@ -1664,7 +1596,6 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con } Any WrappedNumberOfLinesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( !detectInnerValue( aRet ) ) @@ -1673,7 +1604,6 @@ Any WrappedNumberOfLinesProperty::getPropertyValue( const Reference< beans::XPro } Any WrappedNumberOfLinesProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= sal_Int32( 0 ); @@ -1686,14 +1616,11 @@ class WrappedAttributedDataPointsProperty : public WrappedProperty public: explicit WrappedAttributedDataPointsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1709,7 +1636,6 @@ WrappedAttributedDataPointsProperty::WrappedAttributedDataPointsProperty(const s } void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { uno::Sequence< uno::Sequence< sal_Int32 > > aNewValue; if( ! (rOuterValue >>= aNewValue) ) @@ -1748,7 +1674,6 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal } Any WrappedAttributedDataPointsProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY ); @@ -1781,7 +1706,6 @@ Any WrappedAttributedDataPointsProperty::getPropertyValue( const Reference< bean } Any WrappedAttributedDataPointsProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; uno::Sequence< uno::Sequence< sal_Int32 > > aSeq; @@ -1795,14 +1719,11 @@ class WrappedSolidTypeProperty : public WrappedProperty public: explicit WrappedSolidTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1818,7 +1739,6 @@ WrappedSolidTypeProperty::WrappedSolidTypeProperty(const std::shared_ptr<Chart2M } void WrappedSolidTypeProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nNewSolidType = css::chart::ChartSolidType::RECTANGULAR_SOLID; if( ! (rOuterValue >>= nNewSolidType) ) @@ -1838,7 +1758,6 @@ void WrappedSolidTypeProperty::setPropertyValue( const Any& rOuterValue, const R } Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) @@ -1853,7 +1772,6 @@ Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropert } Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( css::chart::ChartSolidType::RECTANGULAR_SOLID ); } @@ -1863,14 +1781,11 @@ class WrappedAutomaticSizeProperty : public WrappedProperty public: WrappedAutomaticSizeProperty(); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; }; WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty() @@ -1879,7 +1794,6 @@ WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty() } void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( xInnerPropertySet.is() ) { @@ -1904,7 +1818,6 @@ void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, con } Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) @@ -1917,7 +1830,6 @@ Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPro } Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -1930,10 +1842,8 @@ class WrappedIncludeHiddenCellsProperty : public WrappedProperty public: explicit WrappedIncludeHiddenCellsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual Any getPropertyValue(const Reference<beans::XPropertySet>& xInnerPropertySet) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue(const Reference<beans::XPropertySet>& xInnerPropertySet) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1946,7 +1856,6 @@ WrappedIncludeHiddenCellsProperty::WrappedIncludeHiddenCellsProperty(const std:: } void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -1956,7 +1865,6 @@ void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue } Any WrappedIncludeHiddenCellsProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { bool bValue = ChartModelHelper::isIncludeHiddenCells( m_spChart2ModelContact->getChartModel() ); return uno::Any(bValue); @@ -1964,14 +1872,12 @@ Any WrappedIncludeHiddenCellsProperty::getPropertyValue( const Reference< beans: // ____ XDiagramProvider ____ Reference< chart2::XDiagram > SAL_CALL DiagramWrapper::getDiagram() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->getChart2Diagram(); } void SAL_CALL DiagramWrapper::setDiagram( const Reference< chart2::XDiagram >& /*xDiagram*/ ) - 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" ); @@ -2022,19 +1928,16 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties() } OUString SAL_CALL DiagramWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Diagram"); } sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DiagramWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.Diagram", diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 24649f66bc0b..148e4705eb08 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -75,158 +75,116 @@ public: virtual ~DiagramWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; // ____ XDiagram ____ - virtual OUString SAL_CALL getDiagramType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDiagramType() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) override; // ____ XShape (base of XDiagram) ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XAxisSupplier ____ virtual css::uno::Reference< - css::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) override; virtual css::uno::Reference< - css::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) override; // ____ XAxisZSupplier ____ virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getZAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getZAxisTitle() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getZMainGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getZMainGrid() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getZHelpGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getZHelpGrid() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getZAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getZAxis() override; // ____ XTwoAxisXSupplier ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getSecondaryXAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getSecondaryXAxis() override; // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getXAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getXAxisTitle() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getXAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getXAxis() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getXMainGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getXMainGrid() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getXHelpGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getXHelpGrid() override; // ____ XTwoAxisYSupplier ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getSecondaryYAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getSecondaryYAxis() override; // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getYAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getYAxisTitle() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getYAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getYAxis() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getYHelpGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getYHelpGrid() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getYMainGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getYMainGrid() override; // ____ XSecondAxisTitleSupplier ____ virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getSecondXAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getSecondXAxisTitle() override; virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getSecondYAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getSecondYAxisTitle() override; // ____ XStatisticDisplay ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getUpBar() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getUpBar() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getDownBar() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getDownBar() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getMinMaxLine() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getMinMaxLine() override; // ____ X3DDisplay ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getWall() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getWall() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getFloor() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getFloor() override; // ____ X3DDefaultSetter ____ - virtual void SAL_CALL set3DSettingsToDefault() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultRotation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultIllumination() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL set3DSettingsToDefault() override; + virtual void SAL_CALL setDefaultRotation() override; + virtual void SAL_CALL setDefaultIllumination() override; // ____ XDiagramPositioning ____ - virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagramPositionExcludingAxes( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isExcludingDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagramPositionIncludingAxes( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutomaticDiagramPositioning( ) override; + virtual sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) override; + virtual void SAL_CALL setDiagramPositionExcludingAxes( const css::awt::Rectangle& PositionRect ) override; + virtual sal_Bool SAL_CALL isExcludingDiagramPositioning( ) override; + virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) override; + virtual void SAL_CALL setDiagramPositionIncludingAxes( const css::awt::Rectangle& PositionRect ) override; + virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) override; + virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const css::awt::Rectangle& PositionRect ) override; + virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) override; // ____ XDiagramProvider ____ - virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL getDiagram() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL getDiagram() override; + virtual void SAL_CALL setDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index a1ee70db97f0..fb2fb8d7e8e2 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -109,7 +109,6 @@ void GridWrapper::getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDime // ____ XComponent ____ void SAL_CALL GridWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -119,14 +118,12 @@ void SAL_CALL GridWrapper::dispose() void SAL_CALL GridWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL GridWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -170,19 +167,16 @@ const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties() } OUString SAL_CALL GridWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Grid"); } sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartGrid", diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index 818b5fea65b6..2e7097e8e207 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -61,20 +61,14 @@ public: static void getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDimensionIndex, bool& rbSubGrid ); /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 9d4f7ce0ba50..caa5bf8e1eaa 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -57,10 +57,8 @@ class WrappedLegendAlignmentProperty : public WrappedProperty public: WrappedLegendAlignmentProperty(); - virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; protected: virtual Any convertInnerToOuterValue( const Any& rInnerValue ) const override; @@ -73,7 +71,6 @@ WrappedLegendAlignmentProperty::WrappedLegendAlignmentProperty() } Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertySet.is() ) @@ -94,7 +91,6 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP } void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if(xInnerPropertySet.is()) { @@ -280,13 +276,11 @@ LegendWrapper::~LegendWrapper() // ____ XShape ____ awt::Point SAL_CALL LegendWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetLegendPosition(); } void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); if( xProp.is() ) @@ -302,14 +296,11 @@ void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL LegendWrapper::getSize() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetLegendSize(); } void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); if( xProp.is() ) @@ -327,14 +318,12 @@ void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL LegendWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartLegend" ); } // ____ XComponent ____ void SAL_CALL LegendWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -345,14 +334,12 @@ void SAL_CALL LegendWrapper::dispose() void SAL_CALL LegendWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL LegendWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -415,19 +402,16 @@ const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties() } OUString SAL_CALL LegendWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Legend"); } sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartLegend", diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 3c539c6aa779..c59bb25caddc 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -54,12 +54,9 @@ public: virtual ~LegendWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; @@ -67,29 +64,20 @@ public: virtual css::awt::Size getCurrentSizeForReference() override; // ____ XShape ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 4b3f28773c2d..282fcdf5469a 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -130,7 +130,6 @@ MinMaxLineWrapper::~MinMaxLineWrapper() // ____ XComponent ____ void SAL_CALL MinMaxLineWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -138,27 +137,23 @@ void SAL_CALL MinMaxLineWrapper::dispose() void SAL_CALL MinMaxLineWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL MinMaxLineWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL MinMaxLineWrapper::getPropertySetInfo() - 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, std::exception) { Reference< beans::XPropertySet > xPropSet(nullptr); @@ -195,7 +190,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName } } uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -237,22 +231,18 @@ 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, 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, 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, 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, std::exception) { OSL_FAIL("not implemented"); } @@ -260,7 +250,6 @@ 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, std::exception) { sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); for(sal_Int32 nN=0; nN<nMinCount; nN++) @@ -278,7 +267,6 @@ 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, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -295,27 +283,23 @@ 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, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - 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, std::exception) { OSL_FAIL("not implemented"); } //XPropertyState beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) ) return beans::PropertyState_DEFAULT_VALUE; @@ -329,7 +313,6 @@ 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, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -344,13 +327,11 @@ uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertySta return aRetSeq; } void SAL_CALL MinMaxLineWrapper::setPropertyToDefault( const OUString& rPropertyName ) - 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, std::exception) { const tPropertyValueMap& rStaticDefaults = *StaticMinMaxLineWrapperDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticMinMaxLineWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) ); @@ -362,7 +343,6 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rProper //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault( ) - throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = *StaticMinMaxLineWrapperPropertyArray::get(); for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++) @@ -372,7 +352,6 @@ void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault( ) } } void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { @@ -381,7 +360,6 @@ 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, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -397,19 +375,16 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const } OUString SAL_CALL MinMaxLineWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ChartLine"); } sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartLine", diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index 860e70e1923c..07687651e728 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -59,51 +59,45 @@ public: virtual ~MinMaxLineWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; //XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault( ) override; + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index d70606fd28dd..3cbef7fb707d 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -51,12 +51,9 @@ class WrappedTitleStringProperty : public WrappedProperty public: explicit WrappedTitleStringProperty( const Reference< uno::XComponentContext >& xContext ); - virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; protected: Reference< uno::XComponentContext > m_xContext; @@ -69,7 +66,6 @@ WrappedTitleStringProperty::WrappedTitleStringProperty( const Reference< uno::XC } void WrappedTitleStringProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY); if(xTitle.is()) @@ -80,7 +76,6 @@ void WrappedTitleStringProperty::setPropertyValue( const Any& rOuterValue, const } } Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); Reference< chart2::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY); @@ -98,7 +93,6 @@ Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPrope return aRet; } Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( OUString() );//default title is a empty String } @@ -205,13 +199,11 @@ TitleWrapper::~TitleWrapper() // ____ XShape ____ awt::Point SAL_CALL TitleWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetTitlePosition( this->getTitleObject() ); } void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropertySet( this->getInnerPropertySet() ); if(xPropertySet.is()) @@ -227,28 +219,23 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL TitleWrapper::getSize() - 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, std::exception) { OSL_FAIL( "trying to set size of title" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL TitleWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartTitle" ); } // ____ XComponent ____ void SAL_CALL TitleWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -259,14 +246,12 @@ void SAL_CALL TitleWrapper::dispose() void SAL_CALL TitleWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL TitleWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -309,7 +294,7 @@ void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue } void TitleWrapper::setFastCharacterPropertyValue( - sal_Int32 nHandle, const Any& rValue ) throw (uno::Exception) + sal_Int32 nHandle, const Any& rValue ) { OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle && nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP ); @@ -336,7 +321,6 @@ 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, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -348,7 +332,6 @@ void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, con } Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); @@ -360,7 +343,6 @@ Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName ) } beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); @@ -383,7 +365,6 @@ beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rP return aState; } void SAL_CALL TitleWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -395,7 +376,6 @@ 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, std::exception) { Any aRet; @@ -419,7 +399,6 @@ 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, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -432,7 +411,6 @@ 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, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -502,19 +480,16 @@ const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties() } OUString SAL_CALL TitleWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Title"); } sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL TitleWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartTitle", diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index 4017385040b9..b986eb9a2c8c 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -53,12 +53,9 @@ public: virtual ~TitleWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; @@ -67,45 +64,35 @@ public: protected: // ____ XShape ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // character properties have to be handled differently (via the XFormattedString elements) void getFastCharacterPropertyValue( sal_Int32 nHandle, css::uno::Any& rValue ); /// @throws css::uno::Exception - void setFastCharacterPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception); + void setFastCharacterPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ); // ____ WrappedPropertySet ____ - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index ef048b1d945d..19bd0ba2ac1b 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -138,7 +138,6 @@ UpDownBarWrapper::~UpDownBarWrapper() // ____ XComponent ____ void SAL_CALL UpDownBarWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -146,26 +145,22 @@ void SAL_CALL UpDownBarWrapper::dispose() void SAL_CALL UpDownBarWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL UpDownBarWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getPropertySetInfo() - 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, std::exception) { Reference< beans::XPropertySet > xPropSet(nullptr); @@ -187,7 +182,6 @@ 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, std::exception) { Any aRet; @@ -213,22 +207,18 @@ 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, 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, 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, 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, std::exception) { OSL_FAIL("not implemented"); } @@ -236,7 +226,6 @@ 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, std::exception) { sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); for(sal_Int32 nN=0; nN<nMinCount; nN++) @@ -254,7 +243,6 @@ 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, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -269,24 +257,20 @@ 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, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - 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, std::exception) { OSL_FAIL("not implemented"); } //XPropertyState beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { uno::Any aDefault( this->getPropertyDefault( rPropertyName ) ); uno::Any aValue( this->getPropertyValue( rPropertyName ) ); @@ -297,7 +281,6 @@ 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, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -312,13 +295,11 @@ uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStat return aRetSeq; } void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const OUString& rPropertyName ) - 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, std::exception) { const tPropertyValueMap& rStaticDefaults = *StaticUpDownBarWrapperDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticUpDownBarWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) ); @@ -330,7 +311,6 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropert //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( ) - throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = *StaticUpDownBarWrapperPropertyArray::get(); for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++) @@ -340,7 +320,6 @@ void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( ) } } void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { @@ -349,7 +328,6 @@ 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, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -365,19 +343,16 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const } OUString SAL_CALL UpDownBarWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ChartArea"); } sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartArea", diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index dca66c5333fc..6e902d487062 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -58,53 +58,47 @@ public: virtual ~UpDownBarWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; //XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault( ) override; + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 9610bb600392..f179264767fe 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -93,7 +93,6 @@ WallFloorWrapper::~WallFloorWrapper() // ____ XComponent ____ void SAL_CALL WallFloorWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -104,14 +103,12 @@ void SAL_CALL WallFloorWrapper::dispose() void SAL_CALL WallFloorWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL WallFloorWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -153,19 +150,16 @@ const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties( } OUString SAL_CALL WallFloorWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.WallOrFloor"); } sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.xml.UserDefinedAttributesSupplier", diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index 60cd15aff708..c49e6c9ccdbd 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -48,20 +48,14 @@ public: virtual ~WallFloorWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx index 241f716c09ca..ffd6baa83711 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx @@ -39,7 +39,6 @@ WrappedAddInProperty::~WrappedAddInProperty() } void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { Reference< util::XRefreshable > xAddIn; if( ! (rOuterValue >>= xAddIn) ) @@ -49,7 +48,6 @@ void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Refer } Any WrappedAddInProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( m_rChartDocumentWrapper.getAddIn() ); } @@ -64,7 +62,6 @@ WrappedBaseDiagramProperty::~WrappedBaseDiagramProperty() } void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { OUString aBaseDiagram; if( ! (rOuterValue >>= aBaseDiagram) ) @@ -74,7 +71,6 @@ void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const } Any WrappedBaseDiagramProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( m_rChartDocumentWrapper.getBaseDiagram() ); } @@ -89,13 +85,11 @@ WrappedAdditionalShapesProperty::~WrappedAdditionalShapesProperty() } void WrappedAdditionalShapesProperty::setPropertyValue( const Any& /*rOuterValue*/, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { throw lang::IllegalArgumentException( "AdditionalShapes is a read only property", nullptr, 0 ); } Any WrappedAdditionalShapesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( m_rChartDocumentWrapper.getAdditionalShapes() ); } @@ -110,7 +104,6 @@ WrappedRefreshAddInAllowedProperty::~WrappedRefreshAddInAllowedProperty() } void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bUpdateAddIn = true; if( ! (rOuterValue >>= bUpdateAddIn) ) @@ -120,7 +113,6 @@ void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValu } Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( m_rChartDocumentWrapper.getUpdateAddIn() ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx index fc7ea946935b..a95bf97bc4f9 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx @@ -33,11 +33,9 @@ public: explicit WrappedAddInProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedAddInProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -49,11 +47,9 @@ public: explicit WrappedBaseDiagramProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedBaseDiagramProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -65,11 +61,9 @@ public: explicit WrappedAdditionalShapesProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedAdditionalShapesProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -81,11 +75,9 @@ public: explicit WrappedRefreshAddInAllowedProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedRefreshAddInAllowedProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 605fd723cb86..39bcb5140f41 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -38,12 +38,9 @@ class WrappedAutomaticPositionProperty : public WrappedProperty public: WrappedAutomaticPositionProperty(); - virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; }; WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty() @@ -52,7 +49,6 @@ WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty() } void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( xInnerPropertySet.is() ) { @@ -77,7 +73,6 @@ void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, } Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) @@ -90,7 +85,6 @@ Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans:: } Any WrappedAutomaticPositionProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 8aebd9fb02cb..bd80bbd16009 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -38,14 +38,11 @@ public: WrappedAxisAndGridExistenceProperty( bool bAxis, bool bMain, sal_Int32 nDimensionIndex , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -139,7 +136,6 @@ WrappedAxisAndGridExistenceProperty::WrappedAxisAndGridExistenceProperty( bool b } void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -169,7 +165,6 @@ void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterVal } Any WrappedAxisAndGridExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); @@ -187,7 +182,6 @@ Any WrappedAxisAndGridExistenceProperty::getPropertyValue( const Reference< bean } Any WrappedAxisAndGridExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -200,14 +194,11 @@ public: WrappedAxisTitleExistenceProperty( sal_Int32 nTitleIndex , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -256,7 +247,6 @@ WrappedAxisTitleExistenceProperty::WrappedAxisTitleExistenceProperty(sal_Int32 n } void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -281,7 +271,6 @@ void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue } Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { bool bHasTitle = false; @@ -296,7 +285,6 @@ Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans: } Any WrappedAxisTitleExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -309,14 +297,11 @@ public: WrappedAxisLabelExistenceProperty( bool bMain, sal_Int32 nDimensionIndex , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -357,7 +342,6 @@ WrappedAxisLabelExistenceProperty::WrappedAxisLabelExistenceProperty(bool bMain, } void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -383,7 +367,6 @@ void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue } Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); @@ -396,7 +379,6 @@ Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans: } Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= true; diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index 78a0076f82f8..0a63ae3cb19a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -51,7 +51,6 @@ void WrappedCharacterHeightProperty::addWrappedProperties( std::vector< WrappedP } void WrappedCharacterHeightProperty_Base::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if(xInnerPropertySet.is()) { @@ -62,7 +61,6 @@ void WrappedCharacterHeightProperty_Base::setPropertyValue( const Any& rOuterVal } Any WrappedCharacterHeightProperty_Base::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertySet.is() ) @@ -87,7 +85,6 @@ Any WrappedCharacterHeightProperty_Base::getPropertyValue( const Reference< bean } Any WrappedCharacterHeightProperty_Base::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertyState.is() ) @@ -98,7 +95,6 @@ Any WrappedCharacterHeightProperty_Base::getPropertyDefault( const Reference< be } beans::PropertyState WrappedCharacterHeightProperty_Base::getPropertyState( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { return beans::PropertyState_DIRECT_VALUE; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx index cd065de41d33..6902ebb91b86 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx @@ -36,17 +36,13 @@ public: WrappedCharacterHeightProperty_Base( const OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider ); virtual ~WrappedCharacterHeightProperty_Base() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; - virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override; diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx index 9e135594fe82..93bbda452c22 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx @@ -55,9 +55,7 @@ public: WrappedGL3DProperty( const OUString& rInName, const OUString& rOutName, const uno::Any& rDefault, const std::shared_ptr<Chart2ModelContact>& pContact ) : WrappedProperty(rInName, rOutName), maDefault(rDefault), mpModelContact(pContact) {} - virtual uno::Any getPropertyValue( const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) override + virtual uno::Any getPropertyValue( const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const override { uno::Reference<chart2::XChartType> xCT = getChartType(); if (!xCT.is()) @@ -74,10 +72,7 @@ public: }; virtual void setPropertyValue( - const uno::Any& rOutValue, const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) override + const uno::Any& rOutValue, const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const override { uno::Reference<chart2::XChartType> xCT = getChartType(); if (!xCT.is()) @@ -91,8 +86,7 @@ public: catch ( const uno::Exception& ) {} } - virtual void setPropertyToDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPropState*/ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override + virtual void setPropertyToDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPropState*/ ) const override { uno::Reference<chart2::XChartType> xCT = getChartType(); if (!xCT.is()) @@ -106,15 +100,12 @@ public: catch ( const uno::Exception& ) {} } - virtual uno::Any getPropertyDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) override + virtual uno::Any getPropertyDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const override { return maDefault; } - virtual beans::PropertyState getPropertyState( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override + virtual beans::PropertyState getPropertyState( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const override { return beans::PropertyState_DIRECT_VALUE; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 68d9681345e9..57fa2a3aa3c2 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -59,7 +59,6 @@ WrappedBarPositionProperty_Base::~WrappedBarPositionProperty_Base() } void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nNewValue = 0; if( ! (rOuterValue >>= nNewValue) ) @@ -109,7 +108,6 @@ void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue, } Any WrappedBarPositionProperty_Base::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index 27b51f40a9a4..8838ed066d1a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -39,11 +39,9 @@ public: , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); virtual ~WrappedBarPositionProperty_Base() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; void setDimensionAndAxisIndex( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 966dead7aad7..0b41f8900c9a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -42,7 +42,6 @@ WrappedNumberFormatProperty::~WrappedNumberFormatProperty() } void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nFormat = 0; if( ! (rOuterValue >>= nFormat) ) @@ -53,7 +52,6 @@ void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, cons } Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { if( !xInnerPropertySet.is() ) { @@ -78,7 +76,6 @@ Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XProp } Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( sal_Int32( 0 ) ); } @@ -93,7 +90,6 @@ WrappedLinkNumberFormatProperty::~WrappedLinkNumberFormatProperty() } void WrappedLinkNumberFormatProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( !xInnerPropertySet.is() ) { @@ -105,7 +101,6 @@ void WrappedLinkNumberFormatProperty::setPropertyValue( const Any& rOuterValue, } Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { if( !xInnerPropertySet.is() ) { @@ -117,7 +112,6 @@ Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::X } Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { bool bLink = true; return uno::makeAny( bLink ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx index 567e9320c597..296e1fcc7262 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx @@ -37,14 +37,11 @@ public: explicit WrappedNumberFormatProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedNumberFormatProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; friend class WrappedLinkNumberFormatProperty; private: @@ -57,14 +54,11 @@ public: explicit WrappedLinkNumberFormatProperty(); virtual ~WrappedLinkNumberFormatProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index 2be350b47a0f..bd042609183e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -125,19 +125,16 @@ void WrappedScaleProperty::addWrappedProperties( std::vector< WrappedProperty* > } void WrappedScaleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { setPropertyValue( m_eScaleProperty, rOuterValue, xInnerPropertySet ); } Any WrappedScaleProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return getPropertyValue( m_eScaleProperty, xInnerPropertySet ); } void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { m_aOuterValue = rOuterValue; @@ -345,7 +342,6 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons } Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( m_aOuterValue ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx index 164731da68ca..35bd6b30bcf7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx @@ -59,11 +59,9 @@ public: static void addWrappedProperties( std::vector< WrappedProperty* >& rList, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; protected: //methods /// @throws css::beans::UnknownPropertyException @@ -71,13 +69,11 @@ protected: //methods /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - void setPropertyValue( tScaleProperty eScaleProperty, const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); + void setPropertyValue( tScaleProperty eScaleProperty, const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const; /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + css::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 6d19e2ef31c5..5bdd1404089c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -38,12 +38,9 @@ class WrappedScaleTextProperty : public WrappedProperty public: explicit WrappedScaleTextProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -56,7 +53,6 @@ WrappedScaleTextProperty::WrappedScaleTextProperty(const std::shared_ptr<Chart2M } void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { static const char aRefSizeName[] = "ReferencePageSize"; @@ -87,7 +83,6 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R } Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) @@ -102,7 +97,6 @@ Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropert } Any WrappedScaleTextProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index fb1fa0360d4d..0de7f6d77378 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -50,7 +50,6 @@ WrappedD3DTransformMatrixProperty::~WrappedD3DTransformMatrixProperty() } void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( DiagramHelper::isPieOrDonutChart( m_spChart2ModelContact->getChart2Diagram() ) ) { @@ -76,7 +75,6 @@ void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue } Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { if( DiagramHelper::isPieOrDonutChart( m_spChart2ModelContact->getChart2Diagram() ) ) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx index 36564addd3c2..e587f417296c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx @@ -44,11 +44,9 @@ public: const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedD3DTransformMatrixProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 14bbb7d4fd5e..e5ba28c44b45 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -109,8 +109,7 @@ public: } } } - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override { PROPERTYTYPE aNewValue = PROPERTYTYPE(); if( ! (rOuterValue >>= aNewValue) ) @@ -134,8 +133,7 @@ public: } } - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override { if( m_ePropertyType == DIAGRAM ) { @@ -158,8 +156,7 @@ public: } } - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /* xInnerPropertyState */ ) const override { return m_aDefaultValue; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index e7af4fffaf94..9b1d869ee5e7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -93,8 +93,7 @@ public: } return bHasDetectableInnerValue; } - void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const override { PROPERTYTYPE aNewValue; if( ! (rOuterValue >>= aNewValue) ) @@ -131,8 +130,7 @@ public: } } - css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const override { bool bHasAmbiguousValue = false; PROPERTYTYPE aValue; @@ -143,8 +141,7 @@ public: return m_aOuterValue; } - css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const override { return m_aDefaultValue; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 1b95c37d9252..c7f16fe0d61b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -42,11 +42,9 @@ public: , const css::uno::Any& rDefaulValue , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); - void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; virtual uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const = 0; @@ -67,7 +65,6 @@ WrappedStockProperty::WrappedStockProperty( const OUString& rOuterName } void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -104,7 +101,6 @@ void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, c } css::uno::Any WrappedStockProperty::getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { return m_aDefaultValue; } @@ -114,8 +110,7 @@ class WrappedVolumeProperty : public WrappedStockProperty public: explicit WrappedVolumeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override; }; @@ -126,7 +121,6 @@ WrappedVolumeProperty::WrappedVolumeProperty(const std::shared_ptr<Chart2ModelCo } css::uno::Any WrappedVolumeProperty::getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); @@ -181,8 +175,7 @@ class WrappedUpDownProperty : public WrappedStockProperty public: explicit WrappedUpDownProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override; }; @@ -193,7 +186,6 @@ WrappedUpDownProperty::WrappedUpDownProperty(const std::shared_ptr<Chart2ModelCo } css::uno::Any WrappedUpDownProperty::getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 1f8a99eff6c5..ba107ea2e72b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -55,10 +55,8 @@ public: virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; explicit WrappedSymbolTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType); @@ -79,8 +77,7 @@ class WrappedSymbolSizeProperty : public WrappedSeriesOrDiagramProperty< awt::Si public: virtual awt::Size getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const awt::Size& aNewSize ) const override; - virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override; + virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; explicit WrappedSymbolSizeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType); @@ -91,8 +88,7 @@ class WrappedSymbolAndLinesProperty : public WrappedSeriesOrDiagramProperty< boo public: virtual bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const bool& bDrawLines ) const override; - virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override; + virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; explicit WrappedSymbolAndLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType); @@ -242,7 +238,6 @@ void WrappedSymbolTypeProperty::setValueToSeries( const Reference< beans::XPrope } Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { //the old chart (< OOo 2.3) needs symbol-type="automatic" at the plot-area if any of the series should be able to have symbols if( m_ePropertyType == DIAGRAM ) @@ -274,7 +269,6 @@ Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XProper } beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { //the special situation for this property here is that the diagram default can be //different from the normal default and different from all singles series values @@ -451,7 +445,6 @@ void WrappedSymbolSizeProperty::setValueToSeries( } beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { //only export symbol size if necessary if( m_ePropertyType == DIAGRAM ) @@ -511,7 +504,6 @@ void WrappedSymbolAndLinesProperty::setValueToSeries( } beans::PropertyState WrappedSymbolAndLinesProperty::getPropertyState( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { //do not export this property anymore, instead use a linestyle none for no lines return beans::PropertyState_DEFAULT_VALUE; diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx index 9d496a3d9886..bd371b35b80e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx @@ -37,7 +37,6 @@ WrappedTextRotationProperty::~WrappedTextRotationProperty() } beans::PropertyState WrappedTextRotationProperty::getPropertyState( const uno::Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { if( m_bDirectState ) return beans::PropertyState_DIRECT_VALUE; diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx index 8525d61be525..faf102bb0b6e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx @@ -30,8 +30,7 @@ public: explicit WrappedTextRotationProperty( bool bDirectState=false ); virtual ~WrappedTextRotationProperty() override; - virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index b9b82fc0705d..1d434d4f86e6 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -403,7 +403,7 @@ void ChartTypeDialogController::fillExtraControls( const ChartTypeParameter& /*r , const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const { } -void ChartTypeDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const throw (uno::RuntimeException) +void ChartTypeDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const { } @@ -1224,7 +1224,7 @@ void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypePar m_pMF_NumberOfLines->SetLast( nMaxLines ); m_pMF_NumberOfLines->SetMax( nMaxLines ); } -void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& xTemplateProps ) const throw (uno::RuntimeException) +void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& xTemplateProps ) const { if( xTemplateProps.is() ) { diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 39647f97a580..0c40bd95087b 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -112,7 +112,7 @@ public: , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel , const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const; /// @throws css::uno::RuntimeException - virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException); + virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const; bool isSubType( const OUString& rServiceName ); ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const css::uno::Reference< @@ -278,7 +278,7 @@ public: , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel , const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const override; - virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException) override; + virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const override; private: DECL_LINK( ChangeLineCountHdl, Edit&, void ); diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx index a6860d374494..f3ffec17c85b 100644 --- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx @@ -40,21 +40,18 @@ RangeSelectionListener::~RangeSelectionListener() // ____ XRangeSelectionListener ____ void SAL_CALL RangeSelectionListener::done( const sheet::RangeSelectionEvent& aEvent ) - 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, std::exception) { m_rParent.listeningFinished( m_aRange ); } // ____ XEventListener ____ void SAL_CALL RangeSelectionListener::disposing( const lang::EventObject& /*Source*/ ) - 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 fc1384d52e3f..71f5c00bd82a 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -41,16 +41,16 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg() } } // lang::XServiceInfo -OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() { return OUString(CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME); } -css::uno::Sequence<OUString> SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() { return { CHART_TYPE_DIALOG_SERVICE_NAME }; } -uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception ) +uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -71,7 +71,7 @@ VclPtr<Dialog> ChartTypeUnoDlg::createDialog(vcl::Window* _pParent) { return VclPtr<ChartTypeDialog>::Create( _pParent, m_xChartModel ); } -uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() throw(uno::RuntimeException, std::exception) +uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 065a511ea68d..096fecf0c1e5 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -58,25 +58,22 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg() } // lang::XServiceInfo OUString SAL_CALL CreationWizardUnoDlg::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL CreationWizardUnoDlg::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CreationWizardUnoDlg::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART_WIZARD_DIALOG_SERVICE_NAME }; } // XInterface -uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType ) { return OComponentHelper::queryInterface( aType ); } @@ -88,7 +85,7 @@ void SAL_CALL CreationWizardUnoDlg::release() throw () { OComponentHelper::release(); } -uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType ) { if (rType == cppu::UnoType<ui::dialogs::XExecutableDialog>::get()) { @@ -118,7 +115,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rTyp return OComponentHelper::queryAggregation( rType ); } -uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() { static uno::Sequence< uno::Type > aTypeList; @@ -141,28 +138,28 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx return aTypeList; } -uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception ) +uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // XTerminateListener -void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) throw( frame::TerminationVetoException, uno::RuntimeException, std::exception) +void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) { } -void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ ) { // we are going down, so dispose us! dispose(); } -void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source*/ ) { //Listener should deregister himself and release all references to the closing object. } -void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) throw(uno::RuntimeException, std::exception) +void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) { } void CreationWizardUnoDlg::createDialogOnDemand() @@ -203,7 +200,7 @@ IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void ) m_pDialog = nullptr;//avoid duplicate destruction of m_pDialog } -sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) { sal_Int16 nRet = RET_CANCEL; { @@ -219,7 +216,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, std::exception) +void SAL_CALL CreationWizardUnoDlg::initialize( const uno::Sequence< uno::Any >& aArguments ) { const uno::Any* pArguments = aArguments.getConstArray(); for(sal_Int32 i=0; i<aArguments.getLength(); ++i, ++pArguments) @@ -263,7 +260,6 @@ void SAL_CALL CreationWizardUnoDlg::disposing() //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); return nullptr; @@ -271,8 +267,6 @@ 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, std::exception) { if( rPropertyName == "Position" ) { @@ -307,7 +301,6 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyN } uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aRet; if( rPropertyName == "Position" ) @@ -347,25 +340,21 @@ 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, 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, 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, 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, std::exception) { OSL_FAIL("not implemented"); } diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 07416aef68b4..f20c14d3f71e 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -116,7 +116,7 @@ protected: false otherwise @throws css::lang::DisposedException */ - bool CheckDisposeState( bool bThrowException = true ) const throw (css::lang::DisposedException); + bool CheckDisposeState( bool bThrowException = true ) const; /** Events coming from the core have to be processed in this methods. The default implementation returns false, which indicates that the object is @@ -137,14 +137,14 @@ protected: @throws css::uno::RuntimeException */ - void AddState( sal_Int16 aState ) throw (css::uno::RuntimeException); + void AddState( sal_Int16 aState ); /** Removes a state from the set if the set contains the state, otherwise nothing is done. @throws css::uno::RuntimeException */ - void RemoveState( sal_Int16 aState ) throw (css::uno::RuntimeException); + void RemoveState( sal_Int16 aState ); /** has to be overridden by derived classes that support child elements. With this method a rescan is initiated that should result in a correct @@ -211,17 +211,14 @@ protected: @throws css::uno::RuntimeException */ virtual css::uno::Reference< css::accessibility::XAccessible > - ImplGetAccessibleChildById( sal_Int32 i ) const - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + ImplGetAccessibleChildById( sal_Int32 i ) const; /** Is called from getAccessibleChildCount(). Before this method is called, an update of children is done if necessary. @throws css::uno::RuntimeException */ - virtual sal_Int32 ImplGetAccessibleChildCount() const - throw (css::uno::RuntimeException); + virtual sal_Int32 ImplGetAccessibleChildCount() const; const AccessibleElementInfo& GetInfo() const { return m_aAccInfo;} void SetInfo( const AccessibleElementInfo & rNewInfo ); @@ -231,84 +228,58 @@ protected: virtual void SAL_CALL disposing() override; // ________ XAccessible ________ - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override; // ________ XAccessibleContext ________ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 i ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getAccessibleChild( sal_Int32 i ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleParent() override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; /// @return AccessibleRole.SHAPE - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; // has to be implemented by derived classes // virtual OUString SAL_CALL getAccessibleName() // throw (css::uno::RuntimeException); virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRelationSet() override; virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale() - throw (css::accessibility::IllegalAccessibleComponentStateException, - css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; + virtual css::lang::Locale SAL_CALL getLocale() override; // has to be implemented by derived classes // virtual OUString SAL_CALL getAccessibleDescription() // throw (css::uno::RuntimeException); // ________ XAccessibleComponent ________ virtual sal_Bool SAL_CALL containsPoint( - const css::awt::Point& aPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& aPoint ) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleAtPoint( const css::awt::Point& aPoint ) override; // has to be defined in derived classes - virtual css::awt::Rectangle SAL_CALL getBounds() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; + virtual css::awt::Point SAL_CALL getLocation() override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL grabFocus() override; + virtual sal_Int32 SAL_CALL getForeground() override; + virtual sal_Int32 SAL_CALL getBackground() override; // ________ XServiceInfo ________ - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ________ XEventListener ________ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ________ XAccessibleEventBroadcaster ________ virtual void SAL_CALL addAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; virtual void SAL_CALL removeAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; private: enum eColorType diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index a82fc8bd64f0..5fce27f6be09 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -73,31 +73,24 @@ public: // 4: awt::XWindow representing the view's window (is a vcl Window) // all arguments are only valid until next initialization - don't keep them longer virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; // ____ view::XSelectionChangeListener ____ - virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override; // ________ XEventListener ________ - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // ________ XAccessibleContext ________ - virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleDescription() override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual OUString SAL_CALL getAccessibleName() override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; // ________ XAccessibleComponent ________ - virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; protected: // ________ AccessibleChartElement ________ diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index 27744de6d085..bd12ac349475 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -65,34 +65,20 @@ public: text currently. */ virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; // ____ XAccessibleContext ____ - virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( - ::sal_Int32 i ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale() - throw (css::accessibility::IllegalAccessibleComponentStateException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override; + virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual ::sal_Int16 SAL_CALL getAccessibleRole() override; + virtual OUString SAL_CALL getAccessibleDescription() override; + virtual OUString SAL_CALL getAccessibleName() override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override; + virtual css::lang::Locale SAL_CALL getLocale() override; private: std::unique_ptr<::accessibility::AccessibleTextHelper> m_pTextHelper; diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx index ab787002a155..24a7e412ab87 100644 --- a/chart2/source/controller/inc/AxisItemConverter.hxx +++ b/chart2/source/controller/inc/AxisItemConverter.hxx @@ -52,10 +52,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx index 82615553a34d..5c21d43c9365 100644 --- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx @@ -46,10 +46,8 @@ public: protected: virtual const sal_uInt16* GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (css::uno::Exception) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw (css::uno::Exception) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; const css::uno::Reference<css::beans::XPropertySet>& GetRefSizePropertySet() const; diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index eb2ba8857696..40b31bc6ec00 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -112,225 +112,175 @@ public: OUString GetContextName(); // css::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::frame::XController (required interface) virtual void SAL_CALL - attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame ) - throw (css::uno::RuntimeException, std::exception) override; + attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame ) override; virtual sal_Bool SAL_CALL - attachModel( const css::uno::Reference< css::frame::XModel > & xModel ) - throw (css::uno::RuntimeException, std::exception) override; + attachModel( const css::uno::Reference< css::frame::XModel > & xModel ) override; virtual css::uno::Reference< css::frame::XFrame > SAL_CALL - getFrame() throw (css::uno::RuntimeException, std::exception) override; + getFrame() override; virtual css::uno::Reference< css::frame::XModel > SAL_CALL - getModel() throw (css::uno::RuntimeException, std::exception) override; + getModel() override; virtual css::uno::Any SAL_CALL - getViewData() throw (css::uno::RuntimeException, std::exception) override; + getViewData() override; virtual void SAL_CALL - restoreViewData( const css::uno::Any& rValue ) - throw (css::uno::RuntimeException, std::exception) override; + restoreViewData( const css::uno::Any& rValue ) override; virtual sal_Bool SAL_CALL - suspend( sal_Bool bSuspend ) - throw (css::uno::RuntimeException, std::exception) override; + suspend( sal_Bool bSuspend ) override; // css::lang::XComponent (base of XController) virtual void SAL_CALL - dispose() throw (css::uno::RuntimeException, std::exception) override; + dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override; // css::frame::XDispatchProvider (required interface) virtual css::uno::Reference< css::frame::XDispatch> SAL_CALL queryDispatch( const css::util::URL& rURL , const OUString& rTargetFrameName - , sal_Int32 nSearchFlags) - throw (css::uno::RuntimeException, std::exception) override; + , sal_Int32 nSearchFlags) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL - queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor > & xDescripts) - throw (css::uno::RuntimeException, std::exception) override; + queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor > & xDescripts) override; // css::view::XSelectionSupplier (optional interface) virtual sal_Bool SAL_CALL - select( const css::uno::Any& rSelection ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + select( const css::uno::Any& rSelection ) override; virtual css::uno::Any SAL_CALL - getSelection() throw (css::uno::RuntimeException, std::exception) override; + getSelection() override; virtual void SAL_CALL - addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) override; virtual void SAL_CALL - removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) override; // css::ui::XContextMenuInterception (optional interface) virtual void SAL_CALL - registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) - throw (css::uno::RuntimeException, std::exception) override; + registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) override; virtual void SAL_CALL - releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) - throw (css::uno::RuntimeException, std::exception) override; + releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) override; //additional interfaces // css::util::XCloseListener virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source - , sal_Bool GetsOwnership ) - throw (css::util::CloseVetoException - , css::uno::RuntimeException, std::exception) override; + , sal_Bool GetsOwnership ) override; virtual void SAL_CALL - notifyClosing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + notifyClosing( const css::lang::EventObject& Source ) override; // css::util::XEventListener (base of XCloseListener and XModifyListener) virtual void SAL_CALL - disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + disposing( const css::lang::EventObject& Source ) override; // css::frame::XDispatch virtual void SAL_CALL dispatch( const css::util::URL& aURL - , const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) - throw (css::uno::RuntimeException, - std::exception) override; + , const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl - , const css::util::URL& aURL ) - throw (css::uno::RuntimeException, std::exception) override; + , const css::util::URL& aURL ) override; virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl - , const css::util::URL& aURL ) - throw (css::uno::RuntimeException, std::exception) override; + , const css::util::URL& aURL ) override; // css::awt::XWindow virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y - , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) - throw (css::uno::RuntimeException, std::exception) override; + , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override; virtual css::awt::Rectangle SAL_CALL - getPosSize() - throw (css::uno::RuntimeException, std::exception) override; + getPosSize() override; virtual void SAL_CALL - setVisible( sal_Bool Visible ) - throw (css::uno::RuntimeException, std::exception) override; + setVisible( sal_Bool Visible ) override; virtual void SAL_CALL - setEnable( sal_Bool Enable ) - throw (css::uno::RuntimeException, std::exception) override; + setEnable( sal_Bool Enable ) override; virtual void SAL_CALL - setFocus() throw (css::uno::RuntimeException, std::exception) override; + setFocus() override; virtual void SAL_CALL - addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; virtual void SAL_CALL - removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; virtual void SAL_CALL - addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; virtual void SAL_CALL - removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; virtual void SAL_CALL - addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; virtual void SAL_CALL - removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; virtual void SAL_CALL - addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; virtual void SAL_CALL - removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; virtual void SAL_CALL - addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; virtual void SAL_CALL - removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; virtual void SAL_CALL - addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; virtual void SAL_CALL - removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; // css::lang XMultiServiceFactory virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - createInstance( const OUString& aServiceSpecifier ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + createInstance( const OUString& aServiceSpecifier ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< - css::uno::Any >& Arguments ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + css::uno::Any >& Arguments ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getAvailableServiceNames() override; // css::util::XModifyListener virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // css::util::XModeChangeListener virtual void SAL_CALL modeChanged( - const css::util::ModeChangeEvent& _rSource ) - throw (css::uno::RuntimeException, - std::exception) override; + const css::util::ModeChangeEvent& _rSource ) override; // css::frame::XLayoutManagerListener virtual void SAL_CALL layoutEvent( const css::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, - const css::uno::Any& aInfo ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Any& aInfo ) override; // WindowController stuff void PrePaint(vcl::RenderContext& rRenderContext); diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 3cf3aa7a8f99..eacf8d011936 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -62,12 +62,9 @@ public: virtual ~ChartDocumentWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; void setAddIn( const css::uno::Reference< css::util::XRefreshable >& xAddIn ); const css::uno::Reference< css::util::XRefreshable >& getAddIn() const { return m_xAddIn;} @@ -81,98 +78,65 @@ public: css::uno::Reference< css::drawing::XShapes > getAdditionalShapes() const; /// @throws css::uno::RuntimeException - css::uno::Reference< css::drawing::XDrawPage > impl_getDrawPage() const - throw (css::uno::RuntimeException); + css::uno::Reference< css::drawing::XDrawPage > impl_getDrawPage() const; protected: // ____ chart::XChartDocument ____ - virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getTitle() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getSubTitle() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getLegend() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getArea() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart::XDiagram > SAL_CALL getDiagram() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getTitle() override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getSubTitle() override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getLegend() override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getArea() override; + virtual css::uno::Reference< css::chart::XDiagram > SAL_CALL getDiagram() override; virtual void SAL_CALL setDiagram( const css::uno::Reference< - css::chart::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart::XChartData > SAL_CALL getData() - throw (css::uno::RuntimeException, std::exception) override; + css::chart::XDiagram >& xDiagram ) override; + virtual css::uno::Reference< css::chart::XChartData > SAL_CALL getData() override; virtual void SAL_CALL attachData( const css::uno::Reference< - css::chart::XChartData >& xData ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart::XChartData >& xData ) override; // ____ XModel ____ virtual sal_Bool SAL_CALL attachResource( const OUString& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; + virtual OUString SAL_CALL getURL() override; virtual css::uno::Sequence< - css::beans::PropertyValue > SAL_CALL getArgs() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::PropertyValue > SAL_CALL getArgs() override; virtual void SAL_CALL connectController( const css::uno::Reference< - css::frame::XController >& Controller ) - throw (css::uno::RuntimeException, std::exception) override; + css::frame::XController >& Controller ) override; virtual void SAL_CALL disconnectController( const css::uno::Reference< - css::frame::XController >& Controller ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL lockControllers() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlockControllers() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasControllersLocked() - throw (css::uno::RuntimeException, std::exception) override; + css::frame::XController >& Controller ) override; + virtual void SAL_CALL lockControllers() override; + virtual void SAL_CALL unlockControllers() override; + virtual sal_Bool SAL_CALL hasControllersLocked() override; virtual css::uno::Reference< - css::frame::XController > SAL_CALL getCurrentController() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference<css::uno::XInterface > SAL_CALL getCurrentSelection() - throw (css::uno::RuntimeException, std::exception) override; + css::frame::XController > SAL_CALL getCurrentController() override; + virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) override; + virtual css::uno::Reference<css::uno::XInterface > SAL_CALL getCurrentSelection() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // ____ XInterface (for new interfaces) ____ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; // ____ ::utl::OEventListenerAdapter ____ virtual void _disposing( const css::lang::EventObject& rSource ) override; // ____ XDrawPageSupplier ____ - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() override; // ____ XMultiServiceFactory ____ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, - const css::uno::Sequence< css::uno::Any >& Arguments ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& Arguments ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; // ____ XAggregation ____ virtual void SAL_CALL setDelegator( - const css::uno::Reference< css::uno::XInterface >& rDelegator ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::uno::XInterface >& rDelegator ) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override; // ____ WrappedPropertySet ____ virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; diff --git a/chart2/source/controller/inc/ChartToolbarController.hxx b/chart2/source/controller/inc/ChartToolbarController.hxx index 7a11bc5880fa..ad7d45ef5ba7 100644 --- a/chart2/source/controller/inc/ChartToolbarController.hxx +++ b/chart2/source/controller/inc/ChartToolbarController.hxx @@ -39,47 +39,35 @@ public: const ChartToolbarController& operator=(const ChartToolbarController&) = delete; // XToolbarContoller - virtual void SAL_CALL execute(sal_Int16 nKeyModifier) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute(sal_Int16 nKeyModifier) override; - virtual void SAL_CALL click() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click() override; - virtual void SAL_CALL doubleClick() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doubleClick() override; - virtual css::uno::Reference<css::awt::XWindow> SAL_CALL createPopupWindow() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::awt::XWindow> SAL_CALL createPopupWindow() override; virtual css::uno::Reference<css::awt::XWindow> SAL_CALL - createItemWindow(const css::uno::Reference<css::awt::XWindow>& rParent) - throw (css::uno::RuntimeException, std::exception) override; + createItemWindow(const css::uno::Reference<css::awt::XWindow>& rParent) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XStatusListener - virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& rSource) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& rSource) override; // XInitialization - virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rAny) - throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rAny) override; // XUpdatable - virtual void SAL_CALL update() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() override; using cppu::WeakComponentImplHelperBase::disposing; diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx index e510748590f7..030a42f65dde 100644 --- a/chart2/source/controller/inc/DataPointItemConverter.hxx +++ b/chart2/source/controller/inc/DataPointItemConverter.hxx @@ -63,10 +63,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (css::uno::Exception) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw (css::uno::Exception) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx index 49491161b937..9c6990c8cfbb 100644 --- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx +++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx @@ -55,10 +55,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: std::shared_ptr< ItemConverter > m_spGraphicConverter; diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx index 01f8012ef74b..0fafd00d6706 100644 --- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx @@ -54,10 +54,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (css::uno::Exception, std::exception) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: eGraphicObjectType m_eGraphicObjectType; diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index 5763318669eb..2ddbab146bc2 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -148,8 +148,7 @@ protected: @throws css::uno::Exception */ - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (css::uno::Exception, std::exception); + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const; /** for items that can not be mapped directly to a property. @@ -162,8 +161,7 @@ protected: @throws css::uno::Exception */ - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ); + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ); /// Returns the pool SfxItemPool & GetItemPool() const { return m_rItemPool;} diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx index aa86a2889627..794fd1733cd8 100644 --- a/chart2/source/controller/inc/LegendItemConverter.hxx +++ b/chart2/source/controller/inc/LegendItemConverter.hxx @@ -51,10 +51,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index c0b96e63ee10..dcd1d7f6a5a5 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -50,14 +50,11 @@ public: protected: // ____ XRangeSelectionListener ____ - virtual void SAL_CALL done( const css::sheet::RangeSelectionEvent& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL aborted( const css::sheet::RangeSelectionEvent& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL done( const css::sheet::RangeSelectionEvent& aEvent ) override; + virtual void SAL_CALL aborted( const css::sheet::RangeSelectionEvent& aEvent ) override; // ____ XEventListener ____ - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: RangeSelectionListenerParent & m_rParent; diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx index 66b09a51e97b..c61489a45ee5 100644 --- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx @@ -52,10 +52,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: std::shared_ptr< ItemConverter > m_spGraphicConverter; diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx index 78a30541a579..03eaadd967b9 100644 --- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx @@ -51,10 +51,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx index 93550a6f4182..dd313a08de55 100644 --- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx +++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx @@ -44,10 +44,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: css::uno::Reference< css::frame::XModel > m_xChartModel; diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx index 86fb64566888..25897e34d0e0 100644 --- a/chart2/source/controller/inc/StatisticsItemConverter.hxx +++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx @@ -45,10 +45,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: css::uno::Reference< css::frame::XModel > m_xModel; diff --git a/chart2/source/controller/inc/TextLabelItemConverter.hxx b/chart2/source/controller/inc/TextLabelItemConverter.hxx index e89269fda315..3d13cc354f65 100644 --- a/chart2/source/controller/inc/TextLabelItemConverter.hxx +++ b/chart2/source/controller/inc/TextLabelItemConverter.hxx @@ -51,10 +51,8 @@ protected: virtual const sal_uInt16* GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (css::uno::Exception) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw (css::uno::Exception) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: std::vector<ItemConverter*> maConverters; diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx index 6671c57ee4e5..fde086ec12c9 100644 --- a/chart2/source/controller/inc/TitleItemConverter.hxx +++ b/chart2/source/controller/inc/TitleItemConverter.hxx @@ -47,10 +47,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (css::uno::Exception) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw (css::uno::Exception) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 826948c09697..76f7a15d790c 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -44,13 +44,13 @@ private: virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 2c2684127065..7d08d0e6e502 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -53,44 +53,41 @@ public: virtual ~CreationWizardUnoDlg() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) override; + virtual sal_Int16 SAL_CALL execute( ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; DECL_LINK( DialogEventHdl, VclWindowEvent&, void ); diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 2ad5d630d917..fbb79d052b49 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -160,7 +160,6 @@ bool lcl_hasTimeIntervalValue( const uno::Any& rAny ) } void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { if( !m_xAxis.is() ) return; @@ -462,7 +461,6 @@ bool lcl_isAutoMinor( const SfxItemSet & rItemSet ) } bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { if( !m_xAxis.is() ) return false; diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index ed16e0a501fa..503a588061dc 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -107,7 +107,6 @@ bool CharacterPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tPr void CharacterPropertyItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { @@ -307,7 +306,6 @@ void CharacterPropertyItemConverter::FillSpecialItem( bool CharacterPropertyItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; uno::Any aValue; diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 9f4ce523e8ec..6fc7aef87ba3 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -288,7 +288,6 @@ bool DataPointItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNa bool DataPointItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; @@ -548,7 +547,6 @@ bool DataPointItemConverter::ApplySpecialItem( void DataPointItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index d5cc3ada524b..d92889b596ad 100644 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -138,7 +138,6 @@ bool ErrorBarItemConverter::GetItemProperty( bool ErrorBarItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; @@ -331,7 +330,6 @@ bool ErrorBarItemConverter::ApplySpecialItem( void ErrorBarItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index 463269467c9c..dffa2cde9337 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -222,7 +222,6 @@ bool GraphicPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tProp void GraphicPropertyItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (uno::Exception, std::exception) { switch( nWhichId ) { @@ -432,7 +431,6 @@ void GraphicPropertyItemConverter::FillSpecialItem( bool GraphicPropertyItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; uno::Any aValue; diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 20746e7b3c1a..c889873d751f 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -152,14 +152,12 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const void ItemConverter::FillSpecialItem( sal_uInt16 /*nWhichId*/, SfxItemSet & /*rOutItemSet*/ ) const - throw (uno::Exception, std::exception) { OSL_FAIL( "ItemConverter: Unhandled special item found!" ); } bool ItemConverter::ApplySpecialItem( sal_uInt16 /*nWhichId*/, const SfxItemSet & /*rItemSet*/ ) - throw( uno::Exception ) { OSL_FAIL( "ItemConverter: Unhandled special item found!" ); return false; diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index 396d5425a6a6..6a7969639c40 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -95,7 +95,6 @@ bool LegendItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPropertyN } bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet& rInItemSet ) - throw( uno::Exception ) { bool bChanged = false; @@ -166,7 +165,6 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe void LegendItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index 773d24e443b2..f946b3b179c9 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -138,7 +138,6 @@ bool RegressionCurveItemConverter::GetItemProperty( bool RegressionCurveItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { uno::Reference< chart2::XRegressionCurve > xCurve( GetPropertySet(), uno::UNO_QUERY ); bool bChanged = false; @@ -254,7 +253,6 @@ bool RegressionCurveItemConverter::ApplySpecialItem( } void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemSet& rOutItemSet ) const - throw( uno::Exception ) { uno::Reference<chart2::XRegressionCurve> xCurve(GetPropertySet(), uno::UNO_QUERY); OSL_ASSERT(xCurve.is()); diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index 1047923c80dd..1ba39b2ea907 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -110,7 +110,6 @@ bool RegressionEquationItemConverter::GetItemProperty( tWhichIdType nWhichId, tP bool RegressionEquationItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; @@ -135,7 +134,6 @@ bool RegressionEquationItemConverter::ApplySpecialItem( void RegressionEquationItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index 48ecfda6250e..61efffaeeb1b 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -180,7 +180,6 @@ bool SeriesOptionsItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPr } bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; switch( nWhichId ) @@ -359,7 +358,6 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf void SeriesOptionsItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index 433b736fba40..15a8aa7c39fc 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -251,7 +251,6 @@ bool StatisticsItemConverter::GetItemProperty( bool StatisticsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; @@ -615,7 +614,6 @@ bool StatisticsItemConverter::ApplySpecialItem( void StatisticsItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx index 69251ca802ee..1e7abf646beb 100644 --- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx @@ -251,7 +251,6 @@ bool TextLabelItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNa } bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet& rItemSet ) - throw (uno::Exception) { bool bChanged = false; @@ -500,7 +499,6 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte } void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& rOutItemSet ) const - throw (uno::Exception) { switch (nWhichId) { diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index 91d8e36edf01..79dcffcf1f2e 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -161,7 +161,6 @@ bool TitleItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWi bool TitleItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; @@ -191,7 +190,6 @@ bool TitleItemConverter::ApplySpecialItem( void TitleItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 2067180cb258..f9a5d76b7bde 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -341,19 +341,16 @@ bool ChartController::impl_isDisposedOrSuspended() const // lang::XServiceInfo OUString SAL_CALL ChartController::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartController::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartController::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART_CONTROLLER_SERVICE_NAME, @@ -393,7 +390,6 @@ uno::Reference<ui::XSidebar> getSidebarFromModel(const uno::Reference<frame::XMo void SAL_CALL ChartController::attachFrame( const uno::Reference<frame::XFrame>& xFrame ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -508,7 +504,6 @@ void SAL_CALL ChartController::attachFrame( //XModeChangeListener void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent ) - throw (uno::RuntimeException, std::exception) { //adjust controller to view status changes @@ -572,7 +567,6 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent } sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XModel > & xModel ) - throw(uno::RuntimeException, std::exception) { impl_invalidateAccessible(); @@ -661,7 +655,6 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo } uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame() - throw(uno::RuntimeException, std::exception) { //provides access to owner frame of this controller //return the frame containing this controller @@ -670,7 +663,6 @@ uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame() } uno::Reference< frame::XModel > SAL_CALL ChartController::getModel() - throw(uno::RuntimeException, std::exception) { //provides access to currently attached model //returns the currently attached model @@ -684,7 +676,6 @@ uno::Reference< frame::XModel > SAL_CALL ChartController::getModel() } uno::Any SAL_CALL ChartController::getViewData() - 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 @@ -703,7 +694,6 @@ uno::Any SAL_CALL ChartController::getViewData() void SAL_CALL ChartController::restoreViewData( const uno::Any& /* Value */ ) - throw(uno::RuntimeException, std::exception) { //restores the view status using the data gotten from a previous call to XController::getViewData() @@ -715,7 +705,6 @@ void SAL_CALL ChartController::restoreViewData( } sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend ) - throw(uno::RuntimeException, std::exception) { //is called to prepare the controller for closing the view //bSuspend==true: force the controller to suspend his work @@ -774,7 +763,6 @@ void ChartController::impl_deleteDrawViewController() // XComponent (base of XController) void SAL_CALL ChartController::dispose() - throw(uno::RuntimeException, std::exception) { m_bDisposed = true; @@ -892,7 +880,6 @@ void SAL_CALL ChartController::dispose() void SAL_CALL ChartController::addEventListener( const uno::Reference<lang::XEventListener>& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? @@ -904,7 +891,6 @@ void SAL_CALL ChartController::addEventListener( void SAL_CALL ChartController::removeEventListener( const uno::Reference<lang::XEventListener>& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( m_aLifeTimeManager.impl_isDisposed(false) ) @@ -918,7 +904,6 @@ void SAL_CALL ChartController::removeEventListener( void SAL_CALL ChartController::queryClosing( const lang::EventObject& rSource, sal_Bool /*bGetsOwnership*/ ) - throw(util::CloseVetoException, uno::RuntimeException, std::exception) { //do not use the m_aControllerMutex here because this call is not allowed to block @@ -938,7 +923,6 @@ void SAL_CALL ChartController::queryClosing( void SAL_CALL ChartController::notifyClosing( const lang::EventObject& rSource ) - throw(uno::RuntimeException, std::exception) { //Listener should deregister himself and release all references to the closing object. @@ -990,7 +974,6 @@ bool ChartController::impl_releaseThisModel( // util::XEventListener (base of XCloseListener) void SAL_CALL ChartController::disposing( const lang::EventObject& rSource ) - throw(uno::RuntimeException, std::exception) { if( !impl_releaseThisModel( rSource.Source )) { @@ -1003,7 +986,6 @@ void SAL_CALL ChartController::layoutEvent( const lang::EventObject& aSource, sal_Int16 eLayoutEvent, const uno::Any& /* aInfo */ ) - throw (uno::RuntimeException, std::exception) { if( eLayoutEvent == frame::LayoutManagerEvents::MERGEDMENUBAR ) { @@ -1084,7 +1066,6 @@ uno::Reference<frame::XDispatch> SAL_CALL const util::URL& rURL, const OUString& rTargetFrameName, sal_Int32 /* nSearchFlags */) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1099,7 +1080,6 @@ uno::Reference<frame::XDispatch> SAL_CALL uno::Sequence<uno::Reference<frame::XDispatch > > ChartController::queryDispatches( const uno::Sequence<frame::DispatchDescriptor>& xDescripts ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1115,7 +1095,6 @@ uno::Sequence<uno::Reference<frame::XDispatch > > void SAL_CALL ChartController::dispatch( const util::URL& rURL, const uno::Sequence< beans::PropertyValue >& rArgs ) - throw (uno::RuntimeException, std::exception) { OUString aCommand = rURL.Path; @@ -1298,7 +1277,6 @@ void SAL_CALL ChartController::dispatch( void SAL_CALL ChartController::addStatusListener( const uno::Reference<frame::XStatusListener >& /* xControl */, const util::URL& /* aURL */ ) - throw (uno::RuntimeException, std::exception) { //@todo } @@ -1306,7 +1284,6 @@ void SAL_CALL ChartController::addStatusListener( void SAL_CALL ChartController::removeStatusListener( const uno::Reference<frame::XStatusListener >& /* xControl */, const util::URL& /* aURL */ ) - throw (uno::RuntimeException, std::exception) { //@todo } @@ -1314,14 +1291,12 @@ void SAL_CALL ChartController::removeStatusListener( // XContextMenuInterception (optional interface) void SAL_CALL ChartController::registerContextMenuInterceptor( const uno::Reference< ui::XContextMenuInterceptor >& /* xInterceptor */) - throw(uno::RuntimeException, std::exception) { //@todo } void SAL_CALL ChartController::releaseContextMenuInterceptor( const uno::Reference< ui::XContextMenuInterceptor > & /* xInterceptor */) - throw(uno::RuntimeException, std::exception) { //@todo } @@ -1392,8 +1367,6 @@ void ChartController::executeDispatch_MoveSeries( bool bForward ) // ____ XMultiServiceFactory ____ uno::Reference< uno::XInterface > SAL_CALL ChartController::createInstance( const OUString& aServiceSpecifier ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; @@ -1406,7 +1379,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartController::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& /* Arguments */ ) - throw (uno::Exception, uno::RuntimeException, std::exception) { // ignore Arguments return createInstance( ServiceSpecifier ); @@ -1414,7 +1386,6 @@ uno::Reference< uno::XInterface > SAL_CALL uno::Sequence< OUString > SAL_CALL ChartController::getAvailableServiceNames() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aServiceNames { CHART_ACCESSIBLE_TEXT_SERVICE_NAME }; return aServiceNames; @@ -1423,7 +1394,6 @@ uno::Sequence< OUString > SAL_CALL // ____ XModifyListener ____ void SAL_CALL ChartController::modified( const lang::EventObject& /* aEvent */ ) - 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_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 4e7a7912165d..5f37b989d208 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -222,7 +222,6 @@ void SAL_CALL ChartController::setPosSize( sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -270,7 +269,6 @@ void SAL_CALL ChartController::setPosSize( } awt::Rectangle SAL_CALL ChartController::getPosSize() - throw (uno::RuntimeException, std::exception) { //@todo awt::Rectangle aRet(0, 0, 0, 0); @@ -283,7 +281,6 @@ awt::Rectangle SAL_CALL ChartController::getPosSize() } void SAL_CALL ChartController::setVisible( sal_Bool Visible ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -293,7 +290,6 @@ void SAL_CALL ChartController::setVisible( sal_Bool Visible ) } void SAL_CALL ChartController::setEnable( sal_Bool Enable ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -303,7 +299,6 @@ void SAL_CALL ChartController::setEnable( sal_Bool Enable ) } void SAL_CALL ChartController::setFocus() - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -314,7 +309,6 @@ void SAL_CALL ChartController::setFocus() void SAL_CALL ChartController::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -325,7 +319,6 @@ void SAL_CALL ChartController::addWindowListener( void SAL_CALL ChartController::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -336,7 +329,6 @@ void SAL_CALL ChartController::removeWindowListener( void SAL_CALL ChartController::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -347,7 +339,6 @@ void SAL_CALL ChartController::addFocusListener( void SAL_CALL ChartController::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -358,7 +349,6 @@ void SAL_CALL ChartController::removeFocusListener( void SAL_CALL ChartController::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -369,7 +359,6 @@ void SAL_CALL ChartController::addKeyListener( void SAL_CALL ChartController::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -380,7 +369,6 @@ void SAL_CALL ChartController::removeKeyListener( void SAL_CALL ChartController::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -391,7 +379,6 @@ void SAL_CALL ChartController::addMouseListener( void SAL_CALL ChartController::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -402,7 +389,6 @@ void SAL_CALL ChartController::removeMouseListener( void SAL_CALL ChartController::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -413,7 +399,6 @@ void SAL_CALL ChartController::addMouseMotionListener( void SAL_CALL ChartController::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -424,7 +409,6 @@ void SAL_CALL ChartController::removeMouseMotionListener( void SAL_CALL ChartController::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -435,7 +419,6 @@ void SAL_CALL ChartController::addPaintListener( void SAL_CALL ChartController::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference<awt::XWindow> xWindow = m_xViewWindow; @@ -1560,7 +1543,6 @@ bool ChartController::requestQuickHelp( // XSelectionSupplier (optional interface) sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { bool bSuccess = false; @@ -1612,7 +1594,6 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection ) } uno::Any SAL_CALL ChartController::getSelection() - throw(uno::RuntimeException, std::exception) { uno::Any aReturn; if ( m_aSelection.hasSelection() ) @@ -1632,7 +1613,6 @@ uno::Any SAL_CALL ChartController::getSelection() } void SAL_CALL ChartController::addSelectionChangeListener( const uno::Reference<view::XSelectionChangeListener> & xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? @@ -1643,7 +1623,6 @@ void SAL_CALL ChartController::addSelectionChangeListener( const uno::Reference< } void SAL_CALL ChartController::removeSelectionChangeListener( const uno::Reference<view::XSelectionChangeListener> & xListener ) - 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 a8d506834150..8d153a1e07fe 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -57,19 +57,16 @@ bool ChartFrameLoader::impl_checkCancel() // lang::XServiceInfo OUString SAL_CALL ChartFrameLoader::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartFrameLoader::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART_FRAMELOADER_SERVICE_NAME }; } @@ -77,7 +74,6 @@ css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNam // frame::XFrameLoader sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyValue >& rMediaDescriptor, const uno::Reference<frame::XFrame >& xFrame ) - throw (uno::RuntimeException, std::exception) { //@todo ? need to add as terminate listener to desktop? @@ -188,7 +184,6 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyVa } void SAL_CALL ChartFrameLoader::cancel() - throw (uno::RuntimeException, std::exception) { m_oCancelFinished.reset(); m_bCancelRequired = true; diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 159375b21d36..a6911dd7710d 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -48,22 +48,18 @@ public: virtual ~ChartFrameLoader() override; // css::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::frame::XFrameLoader virtual sal_Bool SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor - ,const css::uno::Reference< css::frame::XFrame >& xFrame ) - throw (css::uno::RuntimeException, std::exception) override; + ,const css::uno::Reference< css::frame::XFrame >& xFrame ) override; virtual void SAL_CALL - cancel() throw (css::uno::RuntimeException, std::exception) override; + cancel() override; }; } //namespace chart diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index 851caa41c6ca..42beadb65f8d 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -75,11 +75,9 @@ void SAL_CALL CommandDispatch::disposing() // ____ XDispatch ____ void SAL_CALL CommandDispatch::dispatch( const util::URL& /* URL */, const Sequence< beans::PropertyValue >& /* Arguments */ ) - throw (uno::RuntimeException, std::exception) {} void SAL_CALL CommandDispatch::addStatusListener( const Reference< frame::XStatusListener >& Control, const util::URL& URL ) - throw (uno::RuntimeException, std::exception) { tListenerMap::iterator aIt( m_aListeners.find( URL.Complete )); if( aIt == m_aListeners.end()) @@ -95,7 +93,6 @@ 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, std::exception) { tListenerMap::iterator aIt( m_aListeners.find( URL.Complete )); if( aIt != m_aListeners.end()) @@ -104,14 +101,12 @@ void SAL_CALL CommandDispatch::removeStatusListener( const Reference< frame::XSt // ____ XModifyListener ____ void SAL_CALL CommandDispatch::modified( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException, std::exception) { fireAllStatusEvents( nullptr ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL CommandDispatch::disposing( const lang::EventObject& /* Source */ ) - 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 e4775564ca95..18235c3f8862 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -98,16 +98,13 @@ protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( const css::util::URL& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& Control, - const css::util::URL& URL ) - throw (css::uno::RuntimeException, std::exception) override; + const css::util::URL& URL ) override; virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& Control, - const css::util::URL& URL ) - throw (css::uno::RuntimeException, std::exception) override; + const css::util::URL& URL ) override; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -115,13 +112,11 @@ protected: // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; protected: css::uno::Reference< css::uno::XComponentContext > m_xContext; diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 4175eb8404b7..ebe2b989e7bb 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -745,7 +745,6 @@ void ControllerCommandDispatch::fireStatusEvent( void SAL_CALL ControllerCommandDispatch::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& Arguments ) - throw (uno::RuntimeException, std::exception) { if( commandAvailable( URL.Complete )) m_xDispatch->dispatch( URL, Arguments ); @@ -762,7 +761,6 @@ void SAL_CALL ControllerCommandDispatch::disposing() // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ControllerCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { m_xChartController.clear(); m_xDispatch.clear(); @@ -771,7 +769,6 @@ void SAL_CALL ControllerCommandDispatch::disposing( const lang::EventObject& /* // ____ XModifyListener ____ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { bool bUpdateCommandAvailability = false; @@ -797,7 +794,6 @@ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEve // ____ XSelectionChangeListener ____ void SAL_CALL ControllerCommandDispatch::selectionChanged( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { // Update the "ControllerState" Struct. if( m_apControllerState.get() && m_xChartController.is()) diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index 8afbc619e68f..38d6a8c1e0ed 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -69,8 +69,7 @@ protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( const css::util::URL& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -78,8 +77,7 @@ protected: // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; virtual void fireStatusEvent( const OUString & rURL, @@ -87,13 +85,11 @@ protected: // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; private: void fireStatusEventForURLImpl( diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index fc6e3bb2e123..6fe052ea3db0 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -228,7 +228,6 @@ void DrawCommandDispatch::disposing() // XEventListener void DrawCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index 435e4011edba..7df47171a79e 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -47,8 +47,7 @@ protected: virtual void SAL_CALL disposing() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // state of a feature virtual FeatureState getState( const OUString& rCommand ) override; diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 920658d9e6a1..d2499c243c31 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -244,19 +244,16 @@ Reference< css::accessibility::XAccessible > SelectorListBox::CreateAccessible() } OUString SAL_CALL ElementSelectorToolbarController::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName); } sal_Bool SAL_CALL ElementSelectorToolbarController::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ElementSelectorToolbarController::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.frame.ToolbarController" }; } @@ -267,7 +264,7 @@ ElementSelectorToolbarController::~ElementSelectorToolbarController() { } // XInterface -Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) +Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType ) { Any aReturn = ToolboxController::queryInterface(_rType); if (!aReturn.hasValue()) @@ -282,7 +279,7 @@ void SAL_CALL ElementSelectorToolbarController::release() throw () { ToolboxController::release(); } -void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException, std::exception ) +void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) { if( m_apSelectorListBox.get() ) { @@ -297,7 +294,6 @@ 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, 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 b7dd5708d28f..928b360bc84a 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -73,22 +73,19 @@ public: virtual ~ElementSelectorToolbarController() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override; // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override; private: VclPtr< SelectorListBox > m_apSelectorListBox; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index 8d02473ed58e..7e4b17fdd45f 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -75,7 +75,6 @@ void FeatureCommandDispatchBase::fireStatusEvent( const OUString& rURL, // XDispatch void FeatureCommandDispatchBase::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& Arguments ) - 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 0d6ed195b710..8dca9c202dca 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -60,8 +60,7 @@ public: protected: // XDispatch virtual void SAL_CALL dispatch( const css::util::URL& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; virtual void fireStatusEvent( const OUString& rURL, const css::uno::Reference< css::frame::XStatusListener >& xSingleListener ) override; diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 58b70e6bfecc..478b0a18aa05 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -71,7 +71,6 @@ void ShapeController::disposing() // XEventListener void ShapeController::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index 34885a725283..70fcdecf9297 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -45,8 +45,7 @@ protected: virtual void SAL_CALL disposing() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // state of a feature virtual FeatureState getState( const OUString& rCommand ) override; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index 3fc479921fba..7b04bb4e4af4 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -89,7 +89,6 @@ void StatusBarCommandDispatch::fireStatusEvent( void SAL_CALL StatusBarCommandDispatch::dispatch( const util::URL& /* URL */, const Sequence< beans::PropertyValue >& /* Arguments */ ) - throw (uno::RuntimeException, std::exception) { // nothing to do here } @@ -104,7 +103,6 @@ void SAL_CALL StatusBarCommandDispatch::disposing() // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL StatusBarCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { m_xModifiable.clear(); m_xSelectionSupplier.clear(); @@ -112,7 +110,6 @@ void SAL_CALL StatusBarCommandDispatch::disposing( const lang::EventObject& /* S // ____ XModifyListener ____ void SAL_CALL StatusBarCommandDispatch::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { if( m_xModifiable.is()) m_bIsModified = m_xModifiable->isModified(); @@ -122,7 +119,6 @@ void SAL_CALL StatusBarCommandDispatch::modified( const lang::EventObject& aEven // ____ XSelectionChangeListener ____ void SAL_CALL StatusBarCommandDispatch::selectionChanged( const lang::EventObject& /* aEvent */ ) - 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 87537d902e98..137b8c27142b 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -58,8 +58,7 @@ protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( const css::util::URL& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -67,13 +66,11 @@ protected: // ____ XModifyListener (override from CommandDispatch) ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; virtual void fireStatusEvent( const OUString & rURL, @@ -81,8 +78,7 @@ protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; private: css::uno::Reference< css::util::XModifiable > m_xModifiable; diff --git a/chart2/source/controller/main/ToolbarController.cxx b/chart2/source/controller/main/ToolbarController.cxx index 072804b7eea2..54b1e9019903 100644 --- a/chart2/source/controller/main/ToolbarController.cxx +++ b/chart2/source/controller/main/ToolbarController.cxx @@ -44,12 +44,10 @@ ChartToolbarController::~ChartToolbarController() } void ChartToolbarController::execute(sal_Int16 /*nKeyModifier*/) - throw (css::uno::RuntimeException, std::exception) { } void ChartToolbarController::click() - throw (css::uno::RuntimeException, std::exception) { css::uno::Reference<css::frame::XFrame> xActiveFrame = mxFramesSupplier->getActiveFrame(); if (!xActiveFrame.is()) @@ -69,61 +67,51 @@ void ChartToolbarController::click() } void ChartToolbarController::doubleClick() - throw (css::uno::RuntimeException, std::exception) { SAL_INFO("chart2", "double clicked"); } css::uno::Reference<css::awt::XWindow> ChartToolbarController::createPopupWindow() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Reference<css::awt::XWindow>(); } css::uno::Reference<css::awt::XWindow> ChartToolbarController::createItemWindow( const css::uno::Reference<css::awt::XWindow>& /*rParent*/) - throw (css::uno::RuntimeException, std::exception) { return css::uno::Reference<css::awt::XWindow>(); } void ChartToolbarController::statusChanged(const css::frame::FeatureStateEvent& /*rEvent*/) - throw (css::uno::RuntimeException, std::exception) { } void ChartToolbarController::disposing(const css::lang::EventObject& /*rSource*/) - throw (css::uno::RuntimeException, std::exception) { } void ChartToolbarController::initialize(const css::uno::Sequence<css::uno::Any>& /*rAny*/) - throw (css::uno::Exception, std::exception) { } void ChartToolbarController::update() - throw (css::uno::RuntimeException, std::exception) { } OUString ChartToolbarController::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("org.libreoffice.chart2.Chart2ToolboxController"); } sal_Bool ChartToolbarController::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> ChartToolbarController::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return { "com.sun.star.frame.ToolbarController" }; } diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx index dd02fb4232b8..1c7f9cc8bc70 100644 --- a/chart2/source/controller/main/UndoActions.cxx +++ b/chart2/source/controller/main/UndoActions.cxx @@ -64,7 +64,7 @@ void SAL_CALL UndoElement::disposing() m_xDocumentModel.clear(); } -OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException, std::exception) +OUString SAL_CALL UndoElement::getTitle() { return m_sActionString; } @@ -79,12 +79,12 @@ void UndoElement::impl_toggleModelState() m_pModelClone = pNewClone; } -void SAL_CALL UndoElement::undo( ) throw (UndoFailedException, RuntimeException, std::exception) +void SAL_CALL UndoElement::undo( ) { impl_toggleModelState(); } -void SAL_CALL UndoElement::redo( ) throw (UndoFailedException, RuntimeException, std::exception) +void SAL_CALL UndoElement::redo( ) { impl_toggleModelState(); } @@ -102,21 +102,21 @@ ShapeUndoElement::~ShapeUndoElement() { } -OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException, std::exception) +OUString SAL_CALL ShapeUndoElement::getTitle() { if ( !m_pAction ) throw DisposedException( OUString(), *this ); return m_pAction->GetComment(); } -void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException, std::exception) +void SAL_CALL ShapeUndoElement::undo( ) { if ( !m_pAction ) throw DisposedException( OUString(), *this ); m_pAction->Undo(); } -void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException, std::exception) +void SAL_CALL ShapeUndoElement::redo( ) { if ( !m_pAction ) throw DisposedException( OUString(), *this ); diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index ce63b94ea7da..f1ecf3ee131a 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -66,9 +66,9 @@ public: const UndoElement& operator=(const UndoElement&) = delete; // XUndoAction - virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL undo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL redo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitle() override; + virtual void SAL_CALL undo( ) override; + virtual void SAL_CALL redo( ) override; // OComponentHelper virtual void SAL_CALL disposing() override; @@ -94,9 +94,9 @@ public: explicit ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ); // XUndoAction - virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL undo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL redo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitle() override; + virtual void SAL_CALL undo( ) override; + virtual void SAL_CALL redo( ) override; // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index f170d04778ea..b7466c95c96a 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -83,7 +83,6 @@ void UndoCommandDispatch::fireStatusEvent( void SAL_CALL UndoCommandDispatch::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& /* Arguments */ ) - throw (uno::RuntimeException, std::exception) { if( m_xUndoManager.is() ) { @@ -125,7 +124,6 @@ void SAL_CALL UndoCommandDispatch::disposing() // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL UndoCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - 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 603e493720fe..db6e299c0efd 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -44,8 +44,7 @@ protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( const css::util::URL& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -53,8 +52,7 @@ protected: // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; virtual void fireStatusEvent( const OUString & rURL, diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx index 1da8c639343e..18f327557fec 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx @@ -54,10 +54,6 @@ ChartPanelFactory::~ChartPanelFactory() Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw( - css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - RuntimeException, std::exception) { Reference<css::ui::XUIElement> xElement; @@ -125,19 +121,16 @@ Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement ( } OUString ChartPanelFactory::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("org.libreoffice.comp.chart2.sidebar.ChartPanelFactory"); } sal_Bool ChartPanelFactory::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> ChartPanelFactory::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return { "com.sun.star.ui.UIElementFactory" }; } diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx index 6fe6b4afc209..14570c143a88 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx @@ -46,20 +46,13 @@ public: // XUIElementFactory virtual css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement( const ::rtl::OUString& rsResourceURL, - const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw( - css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; } } // end of namespace sc::sidebar diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx index fdf2dc14a460..b000e55c5aa6 100644 --- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx +++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx @@ -26,13 +26,11 @@ ChartSidebarModifyListener::~ChartSidebarModifyListener() } void ChartSidebarModifyListener::modified(const css::lang::EventObject& /*rEvent*/) - throw (::css::uno::RuntimeException, ::std::exception) { mpParent->updateData(); } void ChartSidebarModifyListener::disposing(const css::lang::EventObject& /*rEvent*/) - throw (::css::uno::RuntimeException, ::std::exception) { mpParent->modelInvalid(); } diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx index 69b71d6157de..9efe382e2761 100644 --- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx +++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx @@ -33,11 +33,9 @@ public: explicit ChartSidebarModifyListener(ChartSidebarModifyListenerParent* pParent); virtual ~ChartSidebarModifyListener() override; - virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) - throw (::css::uno::RuntimeException, ::std::exception) override; + virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) - throw (::css::uno::RuntimeException, ::std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override; private: ChartSidebarModifyListenerParent* mpParent; diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx index 30a2e63bfccc..c94490f1dc1b 100644 --- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx +++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx @@ -40,7 +40,6 @@ ChartSidebarSelectionListener::~ChartSidebarSelectionListener() } void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObject& rEvent) - throw (::css::uno::RuntimeException, ::std::exception) { bool bCorrectObjectSelected = false; @@ -66,7 +65,6 @@ void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObjec } void ChartSidebarSelectionListener::disposing(const css::lang::EventObject& /*rEvent*/) - throw (::css::uno::RuntimeException, ::std::exception) { mpParent->SelectionInvalid(); } diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx index 85df72231369..bf3bdbd2558a 100644 --- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx +++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx @@ -40,11 +40,9 @@ public: ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent, ObjectType eType); virtual ~ChartSidebarSelectionListener() override; - virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent) - throw (::css::uno::RuntimeException, ::std::exception) override; + virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) - throw (::css::uno::RuntimeException, ::std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override; void setAcceptedTypes(const std::vector<ObjectType>& aTypes); diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 2cbe9c6bd048..2e4c6359550e 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -82,12 +82,9 @@ public: virtual ~CachedDataSequence() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -97,48 +94,38 @@ public: protected: // ____ XPropertySet ____ /// @see css::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; /// @see ::comphelper::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; /// @see ::comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // ____ XDataSequence ____ - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() override; + virtual OUString SAL_CALL getSourceRangeRepresentation() override; virtual css::uno::Sequence< OUString > SAL_CALL generateLabel( - css::chart2::data::LabelOrigin nLabelOrigin ) - throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + css::chart2::data::LabelOrigin nLabelOrigin ) override; + virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) override; // ____ XNumericalDataSequence ____ /// @see css::chart::data::XNumericalDataSequence - virtual css::uno::Sequence< double > SAL_CALL getNumericalData() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL getNumericalData() override; // ____ XTextualDataSequence ____ /// @see css::chart::data::XTextualDataSequence - virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // css::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) - throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override; // <properties> sal_Int32 m_nNumberFormatKey; diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index a8feeb12b8a9..7fd695242bd4 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -49,20 +49,16 @@ public: virtual ~ConfigColorScheme() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ ConfigItemListener ____ void notify( const OUString & rPropertyName ); protected: // ____ XColorScheme ____ - virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) override; private: void retrieveConfigColors(); diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index f0d6eb851157..87fcd5693606 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -43,22 +43,17 @@ public: virtual ~DataSource() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: // ____ XDataSource ____ virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL - getDataSequences() - throw (css::uno::RuntimeException, std::exception) override; + getDataSequences() override; // ____ XDataSink ____ - virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) override; private: css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 565e93d94af2..1436d436dd5f 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -83,72 +83,52 @@ public: virtual ~ErrorBar() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName ) - throw (css::beans::UnknownPropertyException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName ) override; virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( - const css::uno::Sequence< OUString >& rPropNames ) - throw (css::beans::UnknownPropertyException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName ) - throw (css::beans::UnknownPropertyException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override; + const css::uno::Sequence< OUString >& rPropNames ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName ) override; protected: ErrorBar( const ErrorBar & rOther ); // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ XDataSink ____ - virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) override; // ____ XDataSource ____ - virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override; private: typedef ::std::vector< css::uno::Reference< diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx index f6400b090329..ba08bb13dfd1 100644 --- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx @@ -39,12 +39,9 @@ private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, - const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<double>& aYValues ) override; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCurveValue( double x ) override; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -52,9 +49,7 @@ private: sal_Int32 nPointCount, const css::uno::Reference<css::chart2::XScaling>& xScalingX, const css::uno::Reference<css::chart2::XScaling>& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; // formula is: f(x) = m_fSign * 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 5142ef7ac6ce..183228250df4 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -80,143 +80,99 @@ public: virtual ~InternalDataProvider() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XInternalDataProvider ____ - virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL - getDataByRangeRepresentation( const OUString& aRange ) - throw (css::uno::RuntimeException, std::exception) override; + getDataByRangeRepresentation( const OUString& aRange ) override; virtual void SAL_CALL setDataByRangeRepresentation( const OUString& aRange, - const css::uno::Sequence< css::uno::Any >& aNewData ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendSequence() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aNewData ) override; + virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex ) override; + virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex ) override; + virtual void SAL_CALL appendSequence() override; + virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel ) override; + virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel ) override; + virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) override; + virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) override; + virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) override; virtual void SAL_CALL registerDataSequenceForChanges( - const css::uno::Reference< css::chart2::data::XDataSequence >& xSeq ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSequence >& xSeq ) override; // ____ XDataProvider (base of XInternalDataProvider) ____ virtual sal_Bool SAL_CALL createDataSourcePossible( - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource( - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments( - const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) override; virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( - const OUString& aRangeRepresentation ) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& aRangeRepresentation ) override; virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( - const OUString& aRangeRepresentation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const OUString& aRangeRepresentation ) override; virtual css::uno::Reference<css::chart2::data::XDataSequence> SAL_CALL - createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) override; - virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() override; // ____ XRangeXMLConversion ____ virtual OUString SAL_CALL convertRangeToXML( - const OUString& aRangeRepresentation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const OUString& aRangeRepresentation ) override; virtual OUString SAL_CALL convertRangeFromXML( - const OUString& aXMLRange ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const OUString& aXMLRange ) override; // ____ XDateCategories ____ - virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL getDateCategories() override; + virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) override; // ____ XAnyDescriptionAccess ____ virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL - getAnyRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getAnyRowDescriptions() override; virtual void SAL_CALL setAnyRowDescriptions( - const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) override; virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL - getAnyColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getAnyColumnDescriptions() override; virtual void SAL_CALL setAnyColumnDescriptions( - const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) override; // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL - getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getComplexRowDescriptions() override; virtual void SAL_CALL setComplexRowDescriptions( - const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) override; virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL - getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getComplexColumnDescriptions() override; virtual void SAL_CALL setComplexColumnDescriptions( - const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) override; // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ - virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() override; virtual void SAL_CALL setData( - const css::uno::Sequence< css::uno::Sequence< double > >& aData ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() override; virtual void SAL_CALL setRowDescriptions( - const css::uno::Sequence< OUString >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& aRowDescriptions ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() override; virtual void SAL_CALL setColumnDescriptions( - const css::uno::Sequence< OUString >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& aColumnDescriptions ) override; // ____ XChartData (base of XChartDataArray) ____ virtual void SAL_CALL addChartDataChangeEventListener( - const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override; virtual void SAL_CALL removeChartDataChangeEventListener( - const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getNotANumber() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override; + virtual double SAL_CALL getNotANumber() override; virtual sal_Bool SAL_CALL isNotANumber( - double nNumber ) - throw (css::uno::RuntimeException, std::exception) override; + double nNumber ) override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // css::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) - throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override; private: void addDataSequenceToMap( diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index b36ba3298c3c..948b38898a0d 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -55,37 +55,27 @@ public: virtual ~LabeledDataSequence() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: // ____ XLabeledDataSequence ____ - virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues() override; virtual void SAL_CALL setValues( - const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel() override; virtual void SAL_CALL setLabel( - const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; private: css::uno::Reference< css::chart2::data::XDataSequence > m_xData; diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index ba652671103f..c3a648d26819 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -44,7 +44,7 @@ public: bool impl_isDisposed( bool bAssert=true ); /// @throws css::uno::RuntimeException - bool dispose() throw(css::uno::RuntimeException); + bool dispose(); public: ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; @@ -91,16 +91,13 @@ OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager() override; OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true ); /// @throws css::uno::Exception -OOO_DLLPUBLIC_CHARTTOOLS bool g_close_startTryClose(bool bDeliverOwnership) - throw ( css::uno::Exception ); +OOO_DLLPUBLIC_CHARTTOOLS bool g_close_startTryClose(bool bDeliverOwnership); /// @throws css::util::CloseVetoException -OOO_DLLPUBLIC_CHARTTOOLS bool g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException& ex ) - throw ( css::util::CloseVetoException ); +OOO_DLLPUBLIC_CHARTTOOLS bool g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException& ex ); OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(bool bDeliverOwnership, bool bMyVeto ); OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose(); /// @throws css::uno::RuntimeException -OOO_DLLPUBLIC_CHARTTOOLS void g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) - throw(css::uno::RuntimeException); +OOO_DLLPUBLIC_CHARTTOOLS void g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ); protected: virtual bool impl_canStartApiCall() override; diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index df36c2d72d8d..11d323887b98 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -36,8 +36,7 @@ private: sal_Int32 aDegree, sal_Bool aForceIntercept, double aInterceptValue, - sal_Int32 aPeriod) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 aPeriod) override; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -45,9 +44,7 @@ private: sal_Int32 nPointCount, const css::uno::Reference<css::chart2::XScaling>& xScalingX, const css::uno::Reference<css::chart2::XScaling>& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; }; } // namespace chart diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx index ec16964566aa..522756afe139 100644 --- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx @@ -39,12 +39,9 @@ private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, - const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<double>& aYValues ) override; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCurveValue( double x ) override; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -52,9 +49,7 @@ private: sal_Int32 nPointCount, const css::uno::Reference<css::chart2::XScaling>& xScalingX, const css::uno::Reference<css::chart2::XScaling>& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; // 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 4ccc817b4033..7c947bec4d8c 100644 --- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx @@ -39,12 +39,9 @@ private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, - const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<double>& aYValues ) override; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCurveValue( double x ) override; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -52,9 +49,7 @@ private: sal_Int32 nPointCount, const css::uno::Reference<css::chart2::XScaling>& xScalingX, const css::uno::Reference<css::chart2::XScaling>& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; // formula is: f(x) = m_fMeanValue double m_fMeanValue; diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 5f167233da00..d26bb258839c 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -67,21 +67,17 @@ public: protected: // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ WeakComponentImplHelperBase ____ virtual void SAL_CALL disposing() override; diff --git a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx index a43635a9cc06..fb6185098193 100644 --- a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx @@ -40,12 +40,9 @@ private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, - const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<double>& aYValues ) override; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCurveValue( double x ) override; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -53,9 +50,7 @@ private: sal_Int32 nPointCount, const css::uno::Reference<css::chart2::XScaling>& xScalingX, const css::uno::Reference<css::chart2::XScaling>& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; std::vector<double> aYList; std::vector<double> aXList; diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 91c3a9970a33..268255bfc7c0 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -53,28 +53,28 @@ public: virtual ~NameContainer() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw( css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getElementType( ) throw( css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; private: //member const css::uno::Type m_aType; diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 0d0f5fa02157..fd5ad5632366 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -68,9 +68,7 @@ protected: @throws css::beans::UnknownPropertyException @throws css::uno::RuntimeException */ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) = 0; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const = 0; /** The InfoHelper table contains all property names and types of this object. @@ -110,8 +108,7 @@ protected: ( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; /** The same as setFastProperyValue; nHandle is always valid. The changes must not be broadcasted in this method. @@ -132,8 +129,7 @@ protected: */ virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; /** The same as getFastProperyValue, but return the value through rValue and @@ -156,68 +152,45 @@ protected: // Interfaces // ____ XInterface ____ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; // ____ XTypeProvider ____ virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; // ____ XPropertyState ____ virtual css::beans::PropertyState SAL_CALL - getPropertyState( const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + getPropertyState( const OUString& PropertyName ) override; virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL - getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; virtual void SAL_CALL - setPropertyToDefault( const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + setPropertyToDefault( const OUString& PropertyName ) override; virtual css::uno::Any SAL_CALL - getPropertyDefault( const OUString& aPropertyName ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + getPropertyDefault( const OUString& aPropertyName ) override; // ____ XMultiPropertyStates ____ // Note: getPropertyStates() is already implemented in XPropertyState with the // same signature virtual void SAL_CALL - setAllPropertiesToDefault() - throw (css::uno::RuntimeException, std::exception) override; + setAllPropertiesToDefault() override; virtual void SAL_CALL - setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL - getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override; // ____ XStyleSupplier ____ - virtual css::uno::Reference< css::style::XStyle > SAL_CALL getStyle() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStyle( const css::uno::Reference< css::style::XStyle >& xStyle ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::style::XStyle > SAL_CALL getStyle() override; + virtual void SAL_CALL setStyle( const css::uno::Reference< css::style::XStyle >& xStyle ) override; // ____ XMultiPropertySet ____ virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& PropertyNames, - const css::uno::Sequence< css::uno::Any >& Values ) - throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& Values ) override; // ____ XFastPropertySet ____ - virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) override; // 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 a6e08c6115f7..6037fc742a78 100644 --- a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx @@ -36,16 +36,13 @@ protected: const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter, sal_Int32 nNumberFormatKey, sal_Int32* pFormulaMaxWidth = nullptr ) const override; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCurveValue( double x ) override; private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, - const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<double>& aYValues ) override; std::vector<double> mCoefficients; }; diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 7a890617ca2a..06cdc5080316 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -40,12 +40,9 @@ private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, - const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<double>& aYValues ) override; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCurveValue( double x ) override; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -53,9 +50,7 @@ private: sal_Int32 nPointCount, const css::uno::Reference<css::chart2::XScaling>& xScalingX, const css::uno::Reference<css::chart2::XScaling>& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; // formula is: f(x) = x ^ m_fSlope * m_fSign * m_fIntercept double m_fSlope; diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index a7b67169fab8..01f408116bc8 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -55,24 +55,19 @@ public: protected: // ____ XRangeHighlighter ____ - virtual css::uno::Sequence< css::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges() override; virtual void SAL_CALL addSelectionChangeListener( - const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override; virtual void SAL_CALL removeSelectionChangeListener( - const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override; // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XSelectionChangeListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ 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 ff063c8a8c96..aeab66d280fa 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -67,17 +67,13 @@ protected: sal_Int32 aDegree, sal_Bool aForceIntercept, double aInterceptValue, - sal_Int32 aPeriod) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 aPeriod) override; virtual void SAL_CALL recalculateRegression( const css::uno::Sequence< double >& aXValues, - const css::uno::Sequence< double >& aYValues ) - throw (css::uno::RuntimeException, std::exception) override = 0; + const css::uno::Sequence< double >& aYValues ) override = 0; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override = 0; + virtual double SAL_CALL getCurveValue( double x ) override = 0; virtual css::uno::Sequence< css::geometry::RealPoint2D > SAL_CALL getCurveValues( double min, @@ -85,24 +81,18 @@ protected: sal_Int32 nPointCount, const css::uno::Reference< css::chart2::XScaling >& xScalingX, const css::uno::Reference< css::chart2::XScaling >& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; - virtual double SAL_CALL getCorrelationCoefficient() - throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCorrelationCoefficient() override; - virtual OUString SAL_CALL getRepresentation() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getRepresentation() override; virtual OUString SAL_CALL getFormattedRepresentation( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumFmtSupplier, - sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength ) override; virtual void SAL_CALL setXYNames( - const OUString& aXName, const OUString& aYName ) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& aXName, const OUString& aYName ) override; }; } // namespace chart diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 3b1b4ef14b05..b04d48bc1d4c 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -45,24 +45,19 @@ public: virtual ~LogarithmicScaling() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XScaling ____ - virtual double SAL_CALL doScaling( double value ) - throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL doScaling( double value ) override; virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL - getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; + getInverseScaling() override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; private: const double m_fBase; @@ -83,24 +78,19 @@ public: virtual ~ExponentialScaling() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XScaling ____ virtual double SAL_CALL - doScaling( double value ) - throw (css::uno::RuntimeException, std::exception) override; + doScaling( double value ) override; virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL - getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; + getInverseScaling() override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; private: const double m_fBase; @@ -120,23 +110,18 @@ public: virtual ~LinearScaling() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XScaling ____ - virtual double SAL_CALL doScaling( double value ) - throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL doScaling( double value ) override; virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL - getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; + getInverseScaling() override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; private: const double m_fSlope; @@ -156,24 +141,19 @@ public: virtual ~PowerScaling() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XScaling ____ virtual double SAL_CALL - doScaling( double value ) - throw (css::uno::RuntimeException, std::exception) override; + doScaling( double value ) override; virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL - getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; + getInverseScaling() override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; private: const double m_fExponent; diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index bea4028d36d9..3077586c3803 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -91,12 +91,9 @@ public: virtual ~UncachedDataSequence() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -106,78 +103,54 @@ public: protected: // ____ XPropertySet ____ /// @see css::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; /// @see ::comphelper::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; /// @see ::comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // ____ XDataSequence ____ - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() override; + virtual OUString SAL_CALL getSourceRangeRepresentation() override; virtual css::uno::Sequence< OUString > SAL_CALL generateLabel( - css::chart2::data::LabelOrigin nLabelOrigin ) - throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + css::chart2::data::LabelOrigin nLabelOrigin ) override; + virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) override; // ____ XNumericalDataSequence ____ /// @see css::chart::data::XNumericalDataSequence - virtual css::uno::Sequence< double > SAL_CALL getNumericalData() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL getNumericalData() override; // ____ XTextualDataSequence ____ /// @see css::chart::data::XTextualDataSequence - virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() override; // ____ XIndexReplace ____ - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) - throw (css::lang::IllegalArgumentException, - css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override; // ____ XIndexAccess (base of XIndexReplace) ____ - virtual ::sal_Int32 SAL_CALL getCount() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) - throw (css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override; // ____ XElementAccess (base of XIndexAccess) ____ - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // ____ XNamed (for setting a new range representation) ____ - virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifiable ____ - virtual sal_Bool SAL_CALL isModified() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setModified( sal_Bool bModified ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified() override; + virtual void SAL_CALL setModified( sal_Bool bModified ) override; // ____ XModifyBroadcaster (base of XModifiable) ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; void fireModifyEvent(); diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index 9bbff96bc079..10b3b6357d94 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -56,8 +56,7 @@ public: protected: // ____ XEventListener (base of all listeners) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException) SAL_OVERRIDE + const css::lang::EventObject& Source ) SAL_OVERRIDE { css::uno::Reference< css::lang::XEventListener > xEventListener( css::uno::Reference< Listener >( m_xListener), css::uno::UNO_QUERY ); @@ -84,8 +83,7 @@ public: protected: // ____ XModifyListener ____ - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; }; class WeakSelectionChangeListenerAdapter : @@ -99,8 +97,7 @@ public: protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; }; } // namespace chart diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx index f0a9fed217ed..a3632118171d 100644 --- a/chart2/source/inc/WrappedDefaultProperty.hxx +++ b/chart2/source/inc/WrappedDefaultProperty.hxx @@ -34,20 +34,13 @@ public: virtual ~WrappedDefaultProperty() override; virtual void setPropertyToDefault( - const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; virtual css::uno::Any getPropertyDefault( - const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override; + const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; virtual css::beans::PropertyState getPropertyState( - const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: css::uno::Any m_aOuterDefaultValue; }; diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx index 1c97aa0a5cb8..ba2bc0aac459 100644 --- a/chart2/source/inc/WrappedDirectStateProperty.hxx +++ b/chart2/source/inc/WrappedDirectStateProperty.hxx @@ -34,9 +34,7 @@ public: virtual ~WrappedDirectStateProperty() override; virtual css::beans::PropertyState getPropertyState( - const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; }; } // namespace chart diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index 70f0c37c9862..14bf3ddf514d 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -33,20 +33,15 @@ public: WrappedIgnoreProperty( const OUString& rOuterName, const css::uno::Any& rDefaultValue ); virtual ~WrappedIgnoreProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; -SAL_DLLPRIVATE virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; +SAL_DLLPRIVATE virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; -SAL_DLLPRIVATE virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; +SAL_DLLPRIVATE virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; -SAL_DLLPRIVATE virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; +SAL_DLLPRIVATE virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: css::uno::Any m_aDefaultValue; diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index c22a0cb828ef..d28b83e7c8a2 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -45,30 +45,25 @@ public: /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const; /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const; /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const; /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const; /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const; protected: virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const; diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index cd2c89937e84..5f9f703430d4 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -53,35 +53,35 @@ public: public: //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; //XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault( ) override; + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override; 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 019dd864a402..11e1a6bc57a0 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -195,7 +195,6 @@ XMLFilter::~XMLFilter() // ____ XFilter ____ sal_Bool SAL_CALL XMLFilter::filter( const Sequence< beans::PropertyValue >& aDescriptor ) - throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -234,7 +233,6 @@ sal_Bool SAL_CALL XMLFilter::filter( } void SAL_CALL XMLFilter::cancel() - throw (uno::RuntimeException, std::exception) { // if mutex is locked set "cancel state" // note: is currently ignored in filter-method @@ -247,8 +245,6 @@ void SAL_CALL XMLFilter::cancel() // ____ XImporter ____ void SAL_CALL XMLFilter::setTargetDocument( const Reference< lang::XComponent >& Document ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); OSL_ENSURE( ! m_xSourceDoc.is(), "Setting target doc while source doc is set" ); @@ -259,8 +255,6 @@ void SAL_CALL XMLFilter::setTargetDocument( // ____ XExporter ____ void SAL_CALL XMLFilter::setSourceDocument( const Reference< lang::XComponent >& Document ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); OSL_ENSURE( ! m_xTargetDoc.is(), "Setting source doc while target doc is set" ); @@ -744,19 +738,16 @@ OUString XMLFilter::getMediaType(bool _bOasis) } OUString SAL_CALL XMLFilter::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.XMLFilter"); } sal_Bool SAL_CALL XMLFilter::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL XMLFilter::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.document.ImportFilter", diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx index ab73022b468b..73d7bf87a7a7 100644 --- a/chart2/source/model/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx @@ -61,15 +61,13 @@ public: virtual ~BaseCoordinateSystem() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -78,55 +76,37 @@ public: protected: // ____ XCoordinateSystem ____ - virtual ::sal_Int32 SAL_CALL getDimension() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDimension() override; virtual void SAL_CALL setAxisByDimension( ::sal_Int32 nDimension, const css::uno::Reference< css::chart2::XAxis >& xAxis, - ::sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nIndex ) override; virtual css::uno::Reference< css::chart2::XAxis > SAL_CALL getAxisByDimension( - ::sal_Int32 nDimension, ::sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMaximumAxisIndexByDimension( ::sal_Int32 nDimension ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nDimension, ::sal_Int32 nIndex ) override; + virtual ::sal_Int32 SAL_CALL getMaximumAxisIndexByDimension( ::sal_Int32 nDimension ) override; // ____ XChartTypeContainer ____ virtual void SAL_CALL addChartType( - const css::uno::Reference< css::chart2::XChartType >& aChartType ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XChartType >& aChartType ) override; virtual void SAL_CALL removeChartType( - const css::uno::Reference< css::chart2::XChartType >& aChartType ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > > SAL_CALL getChartTypes() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XChartType >& aChartType ) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > > SAL_CALL getChartTypes() override; virtual void SAL_CALL setChartTypes( - const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aChartTypes ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aChartTypes ) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index 79aac4c21bb1..75d9aa2288b7 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -34,22 +34,16 @@ public: virtual ~CartesianCoordinateSystem() override; // ____ XCoordinateSystem ____ - virtual OUString SAL_CALL getCoordinateSystemType() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getViewServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCoordinateSystemType() override; + virtual OUString SAL_CALL getViewServiceName() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class CartesianCoordinateSystem2d : public CartesianCoordinateSystem @@ -60,12 +54,9 @@ public: virtual ~CartesianCoordinateSystem2d() override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class CartesianCoordinateSystem3d : public CartesianCoordinateSystem @@ -77,12 +68,9 @@ public: virtual ~CartesianCoordinateSystem3d() override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; } // namespace chart diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index 30e2b24cffb1..2a49620e1dfd 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -45,29 +45,21 @@ public: virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; protected: // ____ XMultiServiceFactory ____ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, - const css::uno::Sequence< css::uno::Any >& Arguments ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& Arguments ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; // ____ XChartTypeManager ____ // currently empty diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 7cac9977dfb7..3c477e0afefe 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -71,12 +71,9 @@ public: virtual ~DataSeries() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -92,41 +89,31 @@ protected: // ____ XDataSeries ____ /// @see css::chart2::XDataSeries virtual css::uno::Reference< css::beans::XPropertySet > - SAL_CALL getDataPointByIndex( sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL resetDataPoint( sal_Int32 nIndex ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL resetAllDataPoints() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getDataPointByIndex( sal_Int32 nIndex ) override; + virtual void SAL_CALL resetDataPoint( sal_Int32 nIndex ) override; + virtual void SAL_CALL resetAllDataPoints() override; // ____ XDataSink ____ /// @see css::chart2::data::XDataSink - virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) override; // ____ XDataSource ____ /// @see css::chart2::data::XDataSource - virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ /// @see css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; @@ -134,40 +121,29 @@ protected: // ____ XRegressionCurveContainer ____ /// @see css::chart2::XRegressionCurveContainer virtual void SAL_CALL addRegressionCurve( - const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve ) override; virtual void SAL_CALL removeRegressionCurve( - const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > > SAL_CALL getRegressionCurves() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve ) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > > SAL_CALL getRegressionCurves() override; virtual void SAL_CALL setRegressionCurves( - const css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > >& aRegressionCurves ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > >& aRegressionCurves ) override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 7e724184ba1e..88023bb1f0d6 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -65,12 +65,9 @@ public: virtual ~Diagram() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -81,20 +78,17 @@ protected: explicit Diagram( const Diagram & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XFastPropertySet ____ - virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) override; /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; @@ -103,75 +97,54 @@ protected: css::uno::Any& rValue, sal_Int32 nHandle ) const override; // ____ XDiagram ____ - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getWall() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getFloor() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::XLegend > SAL_CALL getLegend() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getWall() override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getFloor() override; + virtual css::uno::Reference< css::chart2::XLegend > SAL_CALL getLegend() override; virtual void SAL_CALL setLegend( const css::uno::Reference< - css::chart2::XLegend >& xLegend ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::XColorScheme > SAL_CALL getDefaultColorScheme() - throw (css::uno::RuntimeException, std::exception) override; + css::chart2::XLegend >& xLegend ) override; + virtual css::uno::Reference< css::chart2::XColorScheme > SAL_CALL getDefaultColorScheme() override; virtual void SAL_CALL setDefaultColorScheme( - const css::uno::Reference< css::chart2::XColorScheme >& xColorScheme ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XColorScheme >& xColorScheme ) override; virtual void SAL_CALL setDiagramData( const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource, - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; // ____ XCoordinateSystemContainer ____ virtual void SAL_CALL addCoordinateSystem( - const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys ) override; virtual void SAL_CALL removeCoordinateSystem( - const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > > SAL_CALL getCoordinateSystems() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys ) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > > SAL_CALL getCoordinateSystems() override; virtual void SAL_CALL setCoordinateSystems( - const css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > >& aCoordinateSystems ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > >& aCoordinateSystems ) override; // ____ XTitled ____ virtual css::uno::Reference< - css::chart2::XTitle > SAL_CALL getTitleObject() - throw (css::uno::RuntimeException, std::exception) override; + css::chart2::XTitle > SAL_CALL getTitleObject() override; virtual void SAL_CALL setTitleObject( const css::uno::Reference< - css::chart2::XTitle >& Title ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart2::XTitle >& Title ) override; // ____ X3DDefaultSetter ____ - virtual void SAL_CALL set3DSettingsToDefault() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultRotation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultIllumination() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL set3DSettingsToDefault() override; + virtual void SAL_CALL setDefaultRotation() override; + virtual void SAL_CALL setDefaultIllumination() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index f886d066895f..f4d86ee18311 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -34,22 +34,16 @@ public: virtual ~PolarCoordinateSystem() override; // ____ XCoordinateSystem ____ - virtual OUString SAL_CALL getCoordinateSystemType() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getViewServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCoordinateSystemType() override; + virtual OUString SAL_CALL getViewServiceName() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class PolarCoordinateSystem2d : public PolarCoordinateSystem @@ -60,12 +54,9 @@ public: virtual ~PolarCoordinateSystem2d() override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class PolarCoordinateSystem3d : public PolarCoordinateSystem @@ -76,12 +67,9 @@ public: virtual ~PolarCoordinateSystem3d() override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; } // namespace chart diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index 40cf1f2ac212..7401a98e4374 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -56,37 +56,30 @@ protected: explicit StockBar( const StockBar & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index bc8b75ee4a2d..00aa0279d970 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -62,32 +62,23 @@ public: virtual ~XMLFilter() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: // ____ XFilter ____ virtual sal_Bool SAL_CALL filter( - const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override; + virtual void SAL_CALL cancel() override; // ____ XImporter ____ virtual void SAL_CALL setTargetDocument( - const css::uno::Reference< css::lang::XComponent >& Document ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XComponent >& Document ) override; // ____ XExporter ____ virtual void SAL_CALL setSourceDocument( - const css::uno::Reference< css::lang::XComponent >& Document ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XComponent >& Document ) override; inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } @@ -151,16 +142,13 @@ public: {} protected: virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override + getImplementationName() override { return OUString( "com.sun.star.comp.chart2.report.XMLFilter" ); } // ____ XImporter ____ virtual void SAL_CALL setTargetDocument( - const css::uno::Reference< css::lang::XComponent >& Document ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::lang::XComponent >& Document ) override { setDocumentHandler( "com.sun.star.comp.report.ImportDocumentHandler" ); XMLFilter::setTargetDocument(Document); @@ -168,9 +156,7 @@ protected: // ____ XExporter ____ virtual void SAL_CALL setSourceDocument( - const css::uno::Reference< css::lang::XComponent >& Document ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::lang::XComponent >& Document ) override { 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 8ba10b145626..b4ab8bd6389e 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -459,7 +459,6 @@ void Axis::AllocateSubGrids() // ____ XAxis ____ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData ) - throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModifyEventForwarder; Reference< lang::XEventListener > xEventListener; @@ -489,27 +488,23 @@ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData ) } chart2::ScaleData SAL_CALL Axis::getScaleData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return m_aScaleData; } Reference< beans::XPropertySet > SAL_CALL Axis::getGridProperties() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return m_xGrid; } Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubGridProperties() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return m_aSubGridProperties; } Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented yet" ); return Sequence< Reference< beans::XPropertySet > >(); @@ -517,14 +512,12 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties // ____ XTitled ____ Reference< chart2::XTitle > SAL_CALL Axis::getTitleObject() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_xTitle; } void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle ) - throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModifyEventForwarder; Reference< chart2::XTitle > xOldTitle; @@ -545,7 +538,6 @@ void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL Axis::createClone() - throw (uno::RuntimeException, std::exception) { Axis * pNewAxis( new Axis( *this )); // hold a reference to the clone @@ -557,7 +549,6 @@ Reference< util::XCloneable > SAL_CALL Axis::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL Axis::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -571,7 +562,6 @@ void SAL_CALL Axis::addModifyListener( const Reference< util::XModifyListener >& } void SAL_CALL Axis::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -586,14 +576,12 @@ void SAL_CALL Axis::removeModifyListener( const Reference< util::XModifyListener // ____ XModifyListener ____ void SAL_CALL Axis::modified( const lang::EventObject& aEvent ) - 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, std::exception) { if( Source.Source == m_aScaleData.Categories ) m_aScaleData.Categories = nullptr; @@ -612,7 +600,6 @@ void Axis::fireModifyEvent() // ____ OPropertySet ____ uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { const tPropertyValueMap& rStaticDefaults = *StaticAxisDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -628,7 +615,6 @@ uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticAxisInfo::get(); } @@ -640,19 +626,16 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Axis, Axis_Base, ::property::OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Axis::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.Axis"); } sal_Bool SAL_CALL Axis::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.Axis", diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index 6758b92d45b4..5ec250fc36b2 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -58,12 +58,9 @@ public: virtual ~Axis() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -77,59 +74,44 @@ protected: void Init( const Axis & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XAxis ____ - virtual void SAL_CALL setScaleData( const css::chart2::ScaleData& rScaleData ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::chart2::ScaleData SAL_CALL getScaleData() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getGridProperties() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubGridProperties() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubTickProperties() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setScaleData( const css::chart2::ScaleData& rScaleData ) override; + virtual css::chart2::ScaleData SAL_CALL getScaleData() override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getGridProperties() override; + virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubGridProperties() override; + virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubTickProperties() override; // ____ XTitled ____ - virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() override; virtual void SAL_CALL setTitleObject( - const css::uno::Reference< css::chart2::XTitle >& Title ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XTitle >& Title ) override; // ____ XCloneable ____ // Note: the coordinate systems are not cloned! - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 6a10d8404327..04babbc036dd 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -191,7 +191,6 @@ BaseCoordinateSystem::~BaseCoordinateSystem() // ____ XCoordinateSystem ____ sal_Int32 SAL_CALL BaseCoordinateSystem::getDimension() - throw (uno::RuntimeException, std::exception) { return m_nDimensionCount; } @@ -200,8 +199,6 @@ void SAL_CALL BaseCoordinateSystem::setAxisByDimension( sal_Int32 nDimensionIndex, const Reference< chart2::XAxis >& xAxis, sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); @@ -226,8 +223,6 @@ void SAL_CALL BaseCoordinateSystem::setAxisByDimension( Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); @@ -241,8 +236,6 @@ Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension( } sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); @@ -258,8 +251,6 @@ sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int // ____ XChartTypeContainer ____ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChartType >& aChartType ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType ) != m_aChartTypes.end()) @@ -271,8 +262,6 @@ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChar } void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XChartType >& aChartType ) - throw (container::NoSuchElementException, - uno::RuntimeException, std::exception) { ::std::vector< uno::Reference< chart2::XChartType > >::iterator aIt( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType )); @@ -287,14 +276,11 @@ void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XC } Sequence< Reference< chart2::XChartType > > SAL_CALL BaseCoordinateSystem::getChartTypes() - throw (uno::RuntimeException, std::exception) { return comphelper::containerToSequence( m_aChartTypes ); } void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< chart2::XChartType > >& aChartTypes ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { ModifyListenerHelper::removeListenerFromAllElements( m_aChartTypes, m_xModifyEventForwarder ); m_aChartTypes = ContainerHelper::SequenceToVector( aChartTypes ); @@ -304,7 +290,6 @@ void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< ch // ____ XModifyBroadcaster ____ void SAL_CALL BaseCoordinateSystem::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -318,7 +303,6 @@ void SAL_CALL BaseCoordinateSystem::addModifyListener( const Reference< util::XM } void SAL_CALL BaseCoordinateSystem::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -333,14 +317,12 @@ void SAL_CALL BaseCoordinateSystem::removeModifyListener( const Reference< util: // ____ XModifyListener ____ void SAL_CALL BaseCoordinateSystem::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } @@ -358,7 +340,6 @@ void BaseCoordinateSystem::fireModifyEvent() // ____ OPropertySet ____ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticCooSysDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -375,7 +356,6 @@ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL BaseCoordinateSystem::getPropertySetInfo() - 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 5befaffb9748..156b6cce6b53 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -55,39 +55,33 @@ CartesianCoordinateSystem::~CartesianCoordinateSystem() // ____ XCoordinateSystem ____ OUString SAL_CALL CartesianCoordinateSystem::getCoordinateSystemType() - throw (RuntimeException, std::exception) { return OUString(CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME); } OUString SAL_CALL CartesianCoordinateSystem::getViewServiceName() - throw (RuntimeException, std::exception) { return OUString(CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME); } // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL CartesianCoordinateSystem::createClone() - throw (RuntimeException, std::exception) { return Reference< util::XCloneable >( new CartesianCoordinateSystem( *this )); } // ____ XServiceInfo ____ OUString SAL_CALL CartesianCoordinateSystem::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.CartesianCoordinateSystem"); } sal_Bool SAL_CALL CartesianCoordinateSystem::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME }; } @@ -104,19 +98,16 @@ CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d() // ____ XServiceInfo ____ OUString SAL_CALL CartesianCoordinateSystem2d::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem2d"); } sal_Bool SAL_CALL CartesianCoordinateSystem2d::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem2d::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME, @@ -136,19 +127,16 @@ CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d() // ____ XServiceInfo ____ OUString SAL_CALL CartesianCoordinateSystem3d::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem3d"); } sal_Bool SAL_CALL CartesianCoordinateSystem3d::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME, diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 65717729a221..738c8807fa2f 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -193,7 +193,6 @@ ChartModel::~ChartModel() } void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ ) - throw (uno::Exception, uno::RuntimeException, std::exception) { //#i113722# avoid duplicate creation @@ -237,7 +236,7 @@ bool ChartModel::impl_isControllerConnected( const uno::Reference< frame::XContr return false; } -uno::Reference< frame::XController > ChartModel::impl_getCurrentController() throw(uno::RuntimeException) +uno::Reference< frame::XController > ChartModel::impl_getCurrentController() { //@todo? hold only weak references to controllers @@ -257,7 +256,6 @@ uno::Reference< frame::XController > ChartModel::impl_getCurrentController() thr } void SAL_CALL ChartModel::impl_notifyCloseListeners() - throw( uno::RuntimeException) { ::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer .getContainer( cppu::UnoType<util::XCloseListener>::get()); @@ -314,19 +312,16 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV // lang::XServiceInfo OUString SAL_CALL ChartModel::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_MODEL_SERVICE_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartModel::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART_MODEL_SERVICE_NAME, @@ -339,7 +334,6 @@ css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames() sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL , const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw(uno::RuntimeException, std::exception) { /* The method attachResource() is used by the frame loader implementations @@ -363,12 +357,12 @@ sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL return true; } -OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ChartModel::getURL() { return impl_g_getLocation(); } -uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() throw(uno::RuntimeException, std::exception) +uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() { /* The method getArgs() returns a sequence of property values @@ -385,7 +379,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() throw(uno:: } void SAL_CALL ChartModel::connectController( const uno::Reference< frame::XController >& xController ) - throw(uno::RuntimeException, std::exception) { //@todo? this method is declared as oneway -> ...? @@ -399,7 +392,6 @@ void SAL_CALL ChartModel::connectController( const uno::Reference< frame::XContr } void SAL_CALL ChartModel::disconnectController( const uno::Reference< frame::XController >& xController ) - throw(uno::RuntimeException, std::exception) { //@todo? this method is declared as oneway -> ...? @@ -417,7 +409,7 @@ void SAL_CALL ChartModel::disconnectController( const uno::Reference< frame::XCo DisposeHelper::DisposeAndClear( m_xRangeHighlighter ); } -void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException, std::exception) +void SAL_CALL ChartModel::lockControllers() { /* suspends some notifications to the controllers which are used for display updates. @@ -435,7 +427,7 @@ void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException, std::ex ++m_nControllerLockCount; } -void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException, std::exception) +void SAL_CALL ChartModel::unlockControllers() { /* resumes the notifications which were suspended by lockControllers() . @@ -463,7 +455,7 @@ void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException, std:: } } -sal_Bool SAL_CALL ChartModel::hasControllersLocked() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ChartModel::hasControllersLocked() { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -471,7 +463,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, std::exception) +uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController() { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -483,7 +475,6 @@ uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController() } void SAL_CALL ChartModel::setCurrentController( const uno::Reference< frame::XController >& xController ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -502,7 +493,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, std::exception) +uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -529,7 +520,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr } // lang::XComponent (base of XModel) -void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException, std::exception) +void SAL_CALL ChartModel::dispose() { Reference< XInterface > xKeepAlive( *this ); @@ -579,7 +570,6 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException, std::exception) } void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed() ) return; //behave passive if already disposed or closed @@ -588,7 +578,6 @@ void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventLi } void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed @@ -599,13 +588,11 @@ 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, std::exception) { m_aLifeTimeManager.g_addCloseListener( xListener ); } void SAL_CALL ChartModel::removeCloseListener( const uno::Reference< util::XCloseListener > & xListener ) - throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed @@ -616,8 +603,6 @@ 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, std::exception ) { //hold no mutex @@ -670,7 +655,6 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership ) // lang::XTypeProvider uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes() - throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XTypeProvider > xAggTypeProvider; if( (m_xOldModelAgg->queryAggregation( cppu::UnoType<decltype(xAggTypeProvider)>::get()) >>= xAggTypeProvider) @@ -692,7 +676,7 @@ uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes() // document::XDocumentPropertiesSupplier uno::Reference< document::XDocumentProperties > SAL_CALL - ChartModel::getDocumentProperties() throw (uno::RuntimeException, std::exception) + ChartModel::getDocumentProperties() { ::osl::MutexGuard aGuard( m_aModelMutex ); if ( !m_xDocumentProperties.is() ) @@ -703,7 +687,7 @@ uno::Reference< document::XDocumentProperties > SAL_CALL } // document::XDocumentPropertiesSupplier -Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) throw (RuntimeException, std::exception) +Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) { ::osl::MutexGuard aGuard( m_aModelMutex ); if ( !m_pUndoManager.is() ) @@ -714,14 +698,12 @@ Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) thro // chart2::XChartDocument uno::Reference< chart2::XDiagram > SAL_CALL ChartModel::getFirstDiagram() - 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, std::exception) { Reference< chart2::XDiagram > xOldDiagram; Reference< util::XModifyListener > xListener; @@ -781,7 +763,6 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData() } void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingData ) - 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 @@ -799,13 +780,11 @@ void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingDat } sal_Bool SAL_CALL ChartModel::hasInternalDataProvider() - throw (uno::RuntimeException, std::exception) { return m_xDataProvider.is() && m_xInternalDataProvider.is(); } uno::Reference< chart2::data::XDataProvider > SAL_CALL ChartModel::getDataProvider() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xDataProvider; @@ -814,7 +793,6 @@ 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, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -840,7 +818,6 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data } void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< util::XNumberFormatsSupplier >& xNewSupplier ) - throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -870,8 +847,6 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti } void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& aArguments ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -909,19 +884,16 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& } Sequence< OUString > SAL_CALL ChartModel::getUsedRangeRepresentations() - throw (uno::RuntimeException, std::exception) { return DataSourceHelper::getUsedDataRanges( Reference< frame::XModel >(this)); } Reference< chart2::data::XDataSource > SAL_CALL ChartModel::getUsedData() - throw (uno::RuntimeException, std::exception) { return DataSourceHelper::getUsedData( Reference< chart2::XChartDocument >(this)); } Reference< chart2::data::XRangeHighlighter > SAL_CALL ChartModel::getRangeHighlighter() - throw (uno::RuntimeException, std::exception) { if( ! m_xRangeHighlighter.is()) { @@ -942,7 +914,6 @@ Reference< chart2::XChartTypeTemplate > ChartModel::impl_createDefaultChartTypeT } void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XChartTypeManager >& xNewManager ) - throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -952,41 +923,35 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XCh } uno::Reference< chart2::XChartTypeManager > SAL_CALL ChartModel::getChartTypeManager() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xChartTypeManager; } uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getPageBackground() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xPageBackground; } void SAL_CALL ChartModel::createDefaultChart() - throw (css::uno::RuntimeException, std::exception) { insertDefaultChart(); } sal_Bool SAL_CALL ChartModel::isOpenGLChart() - throw (css::uno::RuntimeException, std::exception) { return ChartHelper::isGL3DDiagram(m_xDiagram); } // ____ XTitled ____ uno::Reference< chart2::XTitle > SAL_CALL ChartModel::getTitleObject() - 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, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -1000,7 +965,6 @@ 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, std::exception) { uno::Any aResult( impl::ChartModel_Base::queryInterface( aType )); @@ -1023,17 +987,12 @@ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType ) // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL ChartModel::createClone() - throw (uno::RuntimeException, std::exception) { return Reference< util::XCloneable >( new ChartModel( *this )); } // ____ XVisualObject ____ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Size& aSize ) - throw (lang::IllegalArgumentException, - embed::WrongStateException, - uno::Exception, - uno::RuntimeException, std::exception) { if( nAspect == embed::Aspects::MSOLE_CONTENT ) { @@ -1059,10 +1018,6 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz } awt::Size SAL_CALL ChartModel::getVisualAreaSize( ::sal_Int64 nAspect ) - throw (lang::IllegalArgumentException, - embed::WrongStateException, - uno::Exception, - uno::RuntimeException, std::exception) { OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT, "No aspects other than content are supported" ); @@ -1073,10 +1028,6 @@ awt::Size SAL_CALL ChartModel::getVisualAreaSize( ::sal_Int64 nAspect ) } embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentation( ::sal_Int64 nAspect ) - throw (lang::IllegalArgumentException, - embed::WrongStateException, - uno::Exception, - uno::RuntimeException, std::exception) { OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT, "No aspects other than content are supported" ); @@ -1115,8 +1066,6 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio } ::sal_Int32 SAL_CALL ChartModel::getMapUnit( ::sal_Int64 nAspect ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT, "No aspects other than content are supported" ); @@ -1126,9 +1075,6 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio // ____ datatransfer::XTransferable ____ uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& aFlavor ) - throw (datatransfer::UnsupportedFlavorException, - io::IOException, - uno::RuntimeException, std::exception) { uno::Any aResult; if( this->isDataFlavorSupported( aFlavor )) @@ -1159,7 +1105,6 @@ uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& a } Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors() - throw (uno::RuntimeException, std::exception) { uno::Sequence< datatransfer::DataFlavor > aRet(1); @@ -1171,7 +1116,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors } sal_Bool SAL_CALL ChartModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) - throw (uno::RuntimeException, std::exception) { return aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast); } @@ -1206,7 +1150,6 @@ tServiceNameMap & lcl_getStaticServiceNameMap() } // ____ XMultiServiceFactory ____ Reference< uno::XInterface > SAL_CALL ChartModel::createInstance( const OUString& rServiceSpecifier ) - throw( uno::Exception, uno::RuntimeException, std::exception ) { uno::Reference< uno::XInterface > xResult; tServiceNameMap & rMap = lcl_getStaticServiceNameMap(); @@ -1260,7 +1203,6 @@ 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, std::exception ) { OSL_ENSURE( Arguments.getLength(), "createInstanceWithArguments: Warning: Arguments are ignored" ); (void)(Arguments); // avoid warning in non-debug builds @@ -1268,7 +1210,6 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments( } Sequence< OUString > SAL_CALL ChartModel::getAvailableServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aResult; @@ -1301,7 +1242,6 @@ Reference< util::XNumberFormatsSupplier > const & ChartModel::getNumberFormatsSu // ____ XUnoTunnel ___ ::sal_Int64 SAL_CALL ChartModel::getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) - throw( uno::RuntimeException, std::exception) { if( aIdentifier.getLength() == 16 && 0 == memcmp( SvNumberFormatsSupplierObj::getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) @@ -1315,7 +1255,6 @@ Reference< util::XNumberFormatsSupplier > const & ChartModel::getNumberFormatsSu // ____ XNumberFormatsSupplier ____ uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getNumberFormatSettings() - throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xSupplier( getNumberFormatsSupplier() ); if( xSupplier.is() ) @@ -1324,7 +1263,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getNumberFormatSettin } uno::Reference< util::XNumberFormats > SAL_CALL ChartModel::getNumberFormats() - throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xSupplier( getNumberFormatsSupplier() ); if( xSupplier.is() ) @@ -1334,14 +1272,11 @@ uno::Reference< util::XNumberFormats > SAL_CALL ChartModel::getNumberFormats() // ____ XChild ____ Reference< uno::XInterface > SAL_CALL ChartModel::getParent() - 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, std::exception) { if( Parent != m_xParent ) m_xParent.set( Parent, uno::UNO_QUERY ); @@ -1349,7 +1284,6 @@ void SAL_CALL ChartModel::setParent( const Reference< uno::XInterface >& Parent // ____ XDataSource ____ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartModel::getDataSequences() - throw (uno::RuntimeException, std::exception) { Reference< chart2::data::XDataSource > xSource( DataSourceHelper::getUsedData( uno::Reference< frame::XModel >(this) ) ); @@ -1361,7 +1295,6 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM //XDumper OUString SAL_CALL ChartModel::dump() - throw (uno::RuntimeException, std::exception) { uno::Reference< qa::XDumper > xDumper( this->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); @@ -1416,14 +1349,12 @@ void ChartModel::setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd) } void ChartModel::setWindow( const sal_uInt64 nWindowPtr ) - throw (uno::RuntimeException, std::exception) { OpenGLWindow* pWindow = reinterpret_cast<OpenGLWindow*>(nWindowPtr); mpOpenGLWindow = pWindow; } void ChartModel::update() - throw (uno::RuntimeException, std::exception) { if(!mxChartView.is()) { diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index b2eb99f87453..bba125948d3a 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -202,9 +202,6 @@ Reference< document::XFilter > ChartModel::impl_createFilter( // frame::XStorable2 void SAL_CALL ChartModel::storeSelf( const Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw (lang::IllegalArgumentException, - io::IOException, - uno::RuntimeException, std::exception) { // only some parameters are allowed (see also SfxBaseModel) // "VersionComment", "Author", "InteractionHandler", "StatusIndicator" @@ -215,28 +212,23 @@ void SAL_CALL ChartModel::storeSelf( const Sequence< beans::PropertyValue >& rMe // frame::XStorable (base of XStorable2) sal_Bool SAL_CALL ChartModel::hasLocation() - throw(uno::RuntimeException, std::exception) { //@todo guard return !m_aResource.isEmpty(); } OUString SAL_CALL ChartModel::getLocation() - throw(uno::RuntimeException, std::exception) { return impl_g_getLocation(); } sal_Bool SAL_CALL ChartModel::isReadonly() - throw(uno::RuntimeException, std::exception) { //@todo guard return m_bReadOnly; } void SAL_CALL ChartModel::store() - throw(io::IOException, - uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall(true)) //start LongLastingCall @@ -259,7 +251,6 @@ void SAL_CALL ChartModel::store() void SAL_CALL ChartModel::storeAsURL( const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw(io::IOException, uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall(true)) //start LongLastingCall @@ -285,8 +276,6 @@ void SAL_CALL ChartModel::storeAsURL( void SAL_CALL ChartModel::storeToURL( const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw(io::IOException, - uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall(true)) //start LongLastingCall @@ -481,19 +470,11 @@ void ChartModel::insertDefaultChart() // frame::XLoadable void SAL_CALL ChartModel::initNew() - throw (frame::DoubleInitializationException, - io::IOException, - uno::Exception, - uno::RuntimeException, std::exception) { } void SAL_CALL ChartModel::load( const Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw (frame::DoubleInitializationException, - io::IOException, - uno::Exception, - uno::RuntimeException, std::exception) { Reference< embed::XStorage > xStorage; OUString aURL; @@ -652,7 +633,6 @@ void ChartModel::impl_loadGraphics( // util::XModifiable void SAL_CALL ChartModel::impl_notifyModifiedListeners() - throw( uno::RuntimeException) { { MutexGuard aGuard( m_aModelMutex ); @@ -678,15 +658,12 @@ void SAL_CALL ChartModel::impl_notifyModifiedListeners() } sal_Bool SAL_CALL ChartModel::isModified() - throw(uno::RuntimeException, std::exception) { //@todo guard return m_bModified; } void SAL_CALL ChartModel::setModified( sal_Bool bModified ) - throw(beans::PropertyVetoException, - uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall())//@todo ? is this a long lasting call?? @@ -707,7 +684,6 @@ 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, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed() ) return; //behave passive if already disposed or closed @@ -718,7 +694,6 @@ void SAL_CALL ChartModel::addModifyListener( void SAL_CALL ChartModel::removeModifyListener( const uno::Reference< util::XModifyListener >& xListener ) - throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed @@ -729,7 +704,6 @@ void SAL_CALL ChartModel::removeModifyListener( // util::XModifyListener void SAL_CALL ChartModel::modified( const lang::EventObject& ) - throw (uno::RuntimeException, std::exception) { if( m_nInLoad == 0 ) setModified( true ); @@ -737,7 +711,6 @@ 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, std::exception) { // child was disposed -- should not happen from outside } @@ -746,11 +719,6 @@ void SAL_CALL ChartModel::disposing( const lang::EventObject& ) void SAL_CALL ChartModel::loadFromStorage( const Reference< embed::XStorage >& xStorage, const Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw (lang::IllegalArgumentException, - frame::DoubleInitializationException, - io::IOException, - uno::Exception, - uno::RuntimeException, std::exception) { attachResource( OUString(), rMediaDescriptor ); impl_load( rMediaDescriptor, xStorage ); @@ -759,34 +727,22 @@ void SAL_CALL ChartModel::loadFromStorage( void SAL_CALL ChartModel::storeToStorage( const Reference< embed::XStorage >& xStorage, const Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw (lang::IllegalArgumentException, - io::IOException, - uno::Exception, - uno::RuntimeException, std::exception) { impl_store( rMediaDescriptor, xStorage ); } void SAL_CALL ChartModel::switchToStorage( const Reference< embed::XStorage >& xStorage ) - throw (lang::IllegalArgumentException, - io::IOException, - uno::Exception, - uno::RuntimeException, std::exception) { m_xStorage = xStorage; impl_notifyStorageChangeListeners(); } Reference< embed::XStorage > SAL_CALL ChartModel::getDocumentStorage() - throw (io::IOException, - uno::Exception, - uno::RuntimeException, std::exception) { return m_xStorage; } void SAL_CALL ChartModel::impl_notifyStorageChangeListeners() - throw( uno::RuntimeException) { ::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer .getContainer( cppu::UnoType<document::XStorageChangeListener>::get()); @@ -803,7 +759,6 @@ void SAL_CALL ChartModel::impl_notifyStorageChangeListeners() } void SAL_CALL ChartModel::addStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed() ) return; //behave passive if already disposed or closed @@ -813,7 +768,6 @@ void SAL_CALL ChartModel::addStorageChangeListener( const Reference< document::X } void SAL_CALL ChartModel::removeStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener ) - 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 0f359648f31f..ec5b6bc28d29 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -150,29 +150,24 @@ DataPoint::~DataPoint() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL DataPoint::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new DataPoint( *this )); } // ____ XChild ____ Reference< uno::XInterface > SAL_CALL DataPoint::getParent() - throw (uno::RuntimeException, std::exception) { return Reference< uno::XInterface >( m_xParentProperties.get(), uno::UNO_QUERY ); } void SAL_CALL DataPoint::setParent( const Reference< uno::XInterface >& Parent ) - throw (lang::NoSupportException, - uno::RuntimeException, std::exception) { m_xParentProperties = Reference< beans::XPropertySet >( Parent, uno::UNO_QUERY ); } // ____ OPropertySet ____ uno::Any DataPoint::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { // the value set at the data series is the default uno::Reference< beans::XFastPropertySet > xFast( m_xParentProperties.get(), uno::UNO_QUERY ); @@ -187,7 +182,6 @@ uno::Any DataPoint::GetDefaultValue( sal_Int32 nHandle ) const void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception, std::exception) { if( nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_Y || nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_X ) @@ -221,14 +215,12 @@ void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast( // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL DataPoint::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticDataPointInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL DataPoint::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -242,7 +234,6 @@ void SAL_CALL DataPoint::addModifyListener( const uno::Reference< util::XModifyL } void SAL_CALL DataPoint::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -257,14 +248,12 @@ void SAL_CALL DataPoint::removeModifyListener( const uno::Reference< util::XModi // ____ XModifyListener ____ void SAL_CALL DataPoint::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL DataPoint::disposing( const lang::EventObject& ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -282,19 +271,16 @@ IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertyS // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DataPoint::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.DataPoint") ; } sal_Bool SAL_CALL DataPoint::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DataPoint::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return Sequence< OUString >{ "com.sun.star.drawing.FillProperties", diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index 8335509b8f8f..187c6350aaa7 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -57,60 +57,46 @@ public: /// merge XInterface implementations DECLARE_XINTERFACE() /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: explicit DataPoint( const DataPoint & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ // Note: m_xParentProperties are not cloned! - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XChild ____ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() override; virtual void SAL_CALL setParent( - const css::uno::Reference< css::uno::XInterface >& Parent ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::uno::XInterface >& Parent ) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 7d88338a308a..440634a1978e 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -219,7 +219,6 @@ DataSeries::~DataSeries() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone() - throw (uno::RuntimeException, std::exception) { DataSeries * pNewSeries( new DataSeries( *this )); // hold a reference to the clone @@ -232,8 +231,6 @@ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone() // ____ OPropertySet ____ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const - throw (beans::UnknownPropertyException, - uno::RuntimeException) { const tPropertyValueMap& rStaticDefaults = StaticDataSeriesDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -250,7 +247,6 @@ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL DataSeries::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return StaticDataSeriesInfo::get(); } @@ -272,7 +268,6 @@ void SAL_CALL DataSeries::getFastPropertyValue void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception, std::exception) { if( nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_Y || nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_X ) @@ -301,8 +296,6 @@ void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast( Reference< beans::XPropertySet > SAL_CALL DataSeries::getDataPointByIndex( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xResult; @@ -351,7 +344,6 @@ Reference< beans::XPropertySet > } void SAL_CALL DataSeries::resetDataPoint( sal_Int32 nIndex ) - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xDataPointProp; Reference< util::XModifyListener > xModifyEventForwarder; @@ -376,7 +368,6 @@ void SAL_CALL DataSeries::resetDataPoint( sal_Int32 nIndex ) } void SAL_CALL DataSeries::resetAllDataPoints() - throw (uno::RuntimeException, std::exception) { tDataPointAttributeContainer aOldAttributedDataPoints; Reference< util::XModifyListener > xModifyEventForwarder; @@ -392,7 +383,6 @@ void SAL_CALL DataSeries::resetAllDataPoints() // ____ XDataSink ____ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException, std::exception) { tDataSequenceContainer aOldDataSequences; tDataSequenceContainer aNewDataSequences; @@ -415,7 +405,6 @@ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data: // ____ XDataSource ____ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries::getDataSequences() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return comphelper::containerToSequence( m_aDataSequences ); @@ -424,8 +413,6 @@ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries: // ____ XRegressionCurveContainer ____ void SAL_CALL DataSeries::addRegressionCurve( const uno::Reference< chart2::XRegressionCurve >& xRegressionCurve ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModifyEventForwarder; { @@ -442,8 +429,6 @@ void SAL_CALL DataSeries::addRegressionCurve( void SAL_CALL DataSeries::removeRegressionCurve( const uno::Reference< chart2::XRegressionCurve >& xRegressionCurve ) - throw (container::NoSuchElementException, - uno::RuntimeException, std::exception) { if( !xRegressionCurve.is() ) throw container::NoSuchElementException(); @@ -466,7 +451,6 @@ void SAL_CALL DataSeries::removeRegressionCurve( } uno::Sequence< uno::Reference< chart2::XRegressionCurve > > SAL_CALL DataSeries::getRegressionCurves() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return comphelper::containerToSequence( m_aRegressionCurves ); @@ -474,7 +458,6 @@ uno::Sequence< uno::Reference< chart2::XRegressionCurve > > SAL_CALL DataSeries: void SAL_CALL DataSeries::setRegressionCurves( const Sequence< Reference< chart2::XRegressionCurve > >& aRegressionCurves ) - throw (uno::RuntimeException, std::exception) { tRegressionCurveContainerType aOldCurves; tRegressionCurveContainerType aNewCurves( ContainerHelper::SequenceToVector( aRegressionCurves ) ); @@ -492,7 +475,6 @@ void SAL_CALL DataSeries::setRegressionCurves( // ____ XModifyBroadcaster ____ void SAL_CALL DataSeries::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -506,7 +488,6 @@ void SAL_CALL DataSeries::addModifyListener( const Reference< util::XModifyListe } void SAL_CALL DataSeries::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -521,14 +502,12 @@ void SAL_CALL DataSeries::removeModifyListener( const Reference< util::XModifyLi // ____ XModifyListener ____ void SAL_CALL DataSeries::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // forget disposed data sequences tDataSequenceContainer::iterator aIt( @@ -556,19 +535,16 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DataSeries::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.DataSeries"); } sal_Bool SAL_CALL DataSeries::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.DataSeries", diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index f8323f06df61..47508e5d05f5 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -362,7 +362,6 @@ Diagram::~Diagram() // ____ XDiagram ____ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getWall() - throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xRet; bool bAddListener = false; @@ -381,7 +380,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getWall() } uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getFloor() - throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xRet; bool bAddListener = false; @@ -400,14 +398,12 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getFloor() } uno::Reference< chart2::XLegend > SAL_CALL Diagram::getLegend() - 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, std::exception) { Reference< chart2::XLegend > xOldLegend; { @@ -425,7 +421,6 @@ void SAL_CALL Diagram::setLegend( const uno::Reference< chart2::XLegend >& xNewL } Reference< chart2::XColorScheme > SAL_CALL Diagram::getDefaultColorScheme() - throw (uno::RuntimeException, std::exception) { Reference< chart2::XColorScheme > xRet; { @@ -443,7 +438,6 @@ Reference< chart2::XColorScheme > SAL_CALL Diagram::getDefaultColorScheme() } void SAL_CALL Diagram::setDefaultColorScheme( const Reference< chart2::XColorScheme >& xColorScheme ) - throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex() ); @@ -455,7 +449,6 @@ 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, std::exception) { uno::Reference< lang::XMultiServiceFactory > xChartTypeManager( m_xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.chart2.ChartTypeManager", m_xContext ), uno::UNO_QUERY ); @@ -470,14 +463,12 @@ void SAL_CALL Diagram::setDiagramData( // ____ XTitled ____ uno::Reference< chart2::XTitle > SAL_CALL Diagram::getTitleObject() - 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, std::exception) { Reference< chart2::XTitle > xOldTitle; { @@ -496,19 +487,16 @@ void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle >& x // ____ X3DDefaultSetter ____ void SAL_CALL Diagram::set3DSettingsToDefault() - throw (uno::RuntimeException, std::exception) { ThreeDHelper::set3DSettingsToDefault( this ); } void SAL_CALL Diagram::setDefaultRotation() - throw (uno::RuntimeException, std::exception) { ThreeDHelper::setDefaultRotation( this ); } void SAL_CALL Diagram::setDefaultIllumination() - throw (uno::RuntimeException, std::exception) { ThreeDHelper::setDefaultIllumination( this ); } @@ -516,8 +504,6 @@ void SAL_CALL Diagram::setDefaultIllumination() // ____ XCoordinateSystemContainer ____ void SAL_CALL Diagram::addCoordinateSystem( const uno::Reference< chart2::XCoordinateSystem >& aCoordSys ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex() ); @@ -538,8 +524,6 @@ void SAL_CALL Diagram::addCoordinateSystem( void SAL_CALL Diagram::removeCoordinateSystem( const uno::Reference< chart2::XCoordinateSystem >& aCoordSys ) - throw (container::NoSuchElementException, - uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex() ); @@ -556,7 +540,6 @@ void SAL_CALL Diagram::removeCoordinateSystem( } uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > SAL_CALL Diagram::getCoordinateSystems() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return comphelper::containerToSequence( m_aCoordSystems ); @@ -564,8 +547,6 @@ 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, std::exception) { tCoordinateSystemContainerType aNew; tCoordinateSystemContainerType aOld; @@ -586,7 +567,6 @@ void SAL_CALL Diagram::setCoordinateSystems( // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL Diagram::createClone() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return Reference< util::XCloneable >( new Diagram( *this )); @@ -594,7 +574,6 @@ Reference< util::XCloneable > SAL_CALL Diagram::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL Diagram::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -608,7 +587,6 @@ void SAL_CALL Diagram::addModifyListener( const Reference< util::XModifyListener } void SAL_CALL Diagram::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -623,14 +601,12 @@ void SAL_CALL Diagram::removeModifyListener( const Reference< util::XModifyListe // ____ XModifyListener ____ void SAL_CALL Diagram::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } @@ -648,7 +624,6 @@ void Diagram::fireModifyEvent() // ____ OPropertySet ____ uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticDiagramDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -665,17 +640,12 @@ uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL Diagram::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticDiagramInfo::get(); } // ____ XFastPropertySet ____ void SAL_CALL Diagram::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) - throw(beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { //special treatment for some 3D properties if( PROP_DIAGRAM_PERSPECTIVE == nHandle ) @@ -735,19 +705,16 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySe // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Diagram::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.Diagram"); } sal_Bool SAL_CALL Diagram::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.Diagram", diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 4396a584b71a..bc0224d88b2e 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -113,21 +113,18 @@ FormattedString::~FormattedString() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new FormattedString( *this )); } // ____ XFormattedString ____ OUString SAL_CALL FormattedString::getString() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex()); return m_aString; } void SAL_CALL FormattedString::setString( const OUString& String ) - throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex()); @@ -140,7 +137,6 @@ void SAL_CALL FormattedString::setString( const OUString& String ) // ____ XModifyBroadcaster ____ void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -154,7 +150,6 @@ void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XM } void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -169,14 +164,12 @@ void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util: // ____ XModifyListener ____ void SAL_CALL FormattedString::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } @@ -194,7 +187,6 @@ void FormattedString::fireModifyEvent() // ____ OPropertySet ____ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { const tPropertyValueMap& rStaticDefaults = *StaticFormattedStringDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -211,7 +203,6 @@ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL FormattedString::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticFormattedStringInfo::get(); } @@ -225,19 +216,16 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL FormattedString::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.FormattedString"); } sal_Bool SAL_CALL FormattedString::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.FormattedString", diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 2eb5565bd64b..2a1ea0cf9cc2 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -54,74 +54,61 @@ public: virtual ~FormattedString() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() /// 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, std::exception) override + virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override { ::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, std::exception) override + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) override { 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, std::exception) override + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override { ::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, std::exception) override + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override { ::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, std::exception) override + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { ::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, std::exception) override + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { ::property::OPropertySet::removeVetoableChangeListener(p1, p2); } protected: explicit FormattedString( const FormattedString & rOther ); // ____ XFormattedString ____ - virtual OUString SAL_CALL getString() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( const OUString& String ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString( const OUString& String ) override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index 6c6dee23a355..4014cbd1dda6 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -149,7 +149,6 @@ GridProperties::~GridProperties() // ____ OPropertySet ____ uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticGridDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -165,21 +164,18 @@ uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL GridProperties::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticGridInfo::get(); } // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL GridProperties::createClone() - 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, std::exception) { try { @@ -193,7 +189,6 @@ void SAL_CALL GridProperties::addModifyListener( const Reference< util::XModifyL } void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -208,14 +203,12 @@ void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModi // ____ XModifyListener ____ void SAL_CALL GridProperties::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } @@ -228,19 +221,16 @@ void GridProperties::firePropertyChangeEvent() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL GridProperties::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.GridProperties"); } sal_Bool SAL_CALL GridProperties::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL GridProperties::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.GridProperties", diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index a38481edaf06..798ae0e8a3b7 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -56,12 +56,9 @@ public: virtual ~GridProperties() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -72,37 +69,30 @@ protected: explicit GridProperties( const GridProperties & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 3df5156c86b0..a3a80d642875 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -201,14 +201,12 @@ Legend::~Legend() // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL Legend::createClone() - 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, std::exception) { try { @@ -222,7 +220,6 @@ void SAL_CALL Legend::addModifyListener( const Reference< util::XModifyListener } void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -237,14 +234,12 @@ void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListen // ____ XModifyListener ____ void SAL_CALL Legend::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } @@ -257,7 +252,6 @@ void Legend::firePropertyChangeEvent() // ____ OPropertySet ____ Any Legend::GetDefaultValue( sal_Int32 nHandle ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { const tPropertyValueMap& rStaticDefaults = *StaticLegendDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -273,26 +267,22 @@ Any Legend::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticLegendInfo::get(); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Legend::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.Legend"); } sal_Bool SAL_CALL Legend::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL Legend::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.Legend", diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 8b1a270f1412..044657195d00 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -55,12 +55,9 @@ public: virtual ~Legend() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -71,38 +68,31 @@ protected: explicit Legend( const Legend & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 0252c8c431ba..52308600f912 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -127,14 +127,12 @@ PageBackground::~PageBackground() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL PageBackground::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PageBackground( *this )); } // ____ OPropertySet ____ uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticPageBackgroundDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -150,14 +148,12 @@ uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL PageBackground::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticPageBackgroundInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -171,7 +167,6 @@ void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XMo } void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -186,14 +181,12 @@ void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util:: // ____ XModifyListener ____ void SAL_CALL PageBackground::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } @@ -205,19 +198,16 @@ void PageBackground::firePropertyChangeEvent() } OUString SAL_CALL PageBackground::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.PageBackground"); } sal_Bool SAL_CALL PageBackground::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PageBackground::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.PageBackground", diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index 280ff9b9cde6..f83fd16c75d9 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -52,12 +52,9 @@ public: virtual ~PageBackground() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -66,38 +63,31 @@ protected: explicit PageBackground( const PageBackground & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index 6c26feb60da2..e4ae8792000d 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -55,39 +55,33 @@ PolarCoordinateSystem::~PolarCoordinateSystem() // ____ XCoordinateSystem ____ OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType() - throw (RuntimeException, std::exception) { return OUString(CHART2_COOSYSTEM_POLAR_SERVICE_NAME); } OUString SAL_CALL PolarCoordinateSystem::getViewServiceName() - throw (RuntimeException, std::exception) { return OUString(CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME); } // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL PolarCoordinateSystem::createClone() - throw (RuntimeException, std::exception) { return Reference< util::XCloneable >( new PolarCoordinateSystem( *this )); } // ____ XServiceInfo ____ OUString SAL_CALL PolarCoordinateSystem::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.PolarCoordinateSystem"); } sal_Bool SAL_CALL PolarCoordinateSystem::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME }; } @@ -104,19 +98,16 @@ PolarCoordinateSystem2d::~PolarCoordinateSystem2d() // ____ XServiceInfo ____ OUString SAL_CALL PolarCoordinateSystem2d::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem2d") ; } sal_Bool SAL_CALL PolarCoordinateSystem2d::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem2d::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME, @@ -135,19 +126,16 @@ PolarCoordinateSystem3d::~PolarCoordinateSystem3d() // ____ XServiceInfo ____ OUString SAL_CALL PolarCoordinateSystem3d::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem3d"); } sal_Bool SAL_CALL PolarCoordinateSystem3d::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME, diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 206e48bd85d9..480cc29a41d0 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -138,14 +138,12 @@ StockBar::~StockBar() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL StockBar::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new StockBar( *this )); } // ____ OPropertySet ____ uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticStockBarDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -161,14 +159,12 @@ uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL StockBar::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticStockBarInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -182,7 +178,6 @@ void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyLi } void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -197,14 +192,12 @@ void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModif // ____ XModifyListener ____ void SAL_CALL StockBar::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 621ec2b3143a..042b8ad18ec5 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -265,21 +265,18 @@ Title::~Title() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL Title::createClone() - 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, std::exception) { MutexGuard aGuard( GetMutex() ); return m_aStrings; } void SAL_CALL Title::setText( const uno::Sequence< uno::Reference< chart2::XFormattedString > >& rNewStrings ) - throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Reference< chart2::XFormattedString > > aOldStrings; { @@ -297,7 +294,6 @@ void SAL_CALL Title::setText( const uno::Sequence< uno::Reference< chart2::XForm // ____ OPropertySet ____ uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticTitleDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -313,14 +309,12 @@ uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL Title::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticTitleInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -334,7 +328,6 @@ void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListe } void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -349,14 +342,12 @@ void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyLi // ____ XModifyListener ____ void SAL_CALL Title::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } @@ -373,19 +364,16 @@ void Title::fireModifyEvent() } OUString SAL_CALL Title::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.Title"); } sal_Bool SAL_CALL Title::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL Title::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.Title", diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index e6ff363c6019..95545cd8f8d7 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -53,12 +53,9 @@ public: virtual ~Title() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -69,44 +66,35 @@ protected: explicit Title( const Title & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XTitle ____ - virtual css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText( const css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >& Strings ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() override; + virtual void SAL_CALL setText( const css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >& Strings ) override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx index 08095b2c77fc..664149926c26 100644 --- a/chart2/source/model/main/UndoManager.cxx +++ b/chart2/source/model/main/UndoManager.cxx @@ -197,31 +197,31 @@ namespace chart m_pImpl->disposing(); } - void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().enterUndoContext( i_title, aGuard ); } - void SAL_CALL UndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException, std::exception) + void SAL_CALL UndoManager::enterHiddenUndoContext( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().enterHiddenUndoContext( aGuard ); } - void SAL_CALL UndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException, std::exception) + void SAL_CALL UndoManager::leaveUndoContext( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().leaveUndoContext( aGuard ); } - void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (IllegalArgumentException, RuntimeException, std::exception) + void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addUndoAction( i_action, aGuard ); } - void SAL_CALL UndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception) + void SAL_CALL UndoManager::undo( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().undo( aGuard ); @@ -229,7 +229,7 @@ namespace chart ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) ); } - void SAL_CALL UndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception) + void SAL_CALL UndoManager::redo( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().redo( aGuard ); @@ -237,110 +237,110 @@ namespace chart ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) ); } - sal_Bool SAL_CALL UndoManager::isUndoPossible( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL UndoManager::isUndoPossible( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isUndoPossible(); } - sal_Bool SAL_CALL UndoManager::isRedoPossible( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL UndoManager::isRedoPossible( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isRedoPossible(); } - OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException, std::exception) + OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentUndoActionTitle(); } - OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException, std::exception) + OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentRedoActionTitle(); } - Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllUndoActionTitles(); } - Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllRedoActionTitles(); } - void SAL_CALL UndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException, std::exception) + void SAL_CALL UndoManager::clear( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().clear( aGuard ); } - void SAL_CALL UndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException, std::exception) + void SAL_CALL UndoManager::clearRedo( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().clearRedo( aGuard ); } - void SAL_CALL UndoManager::reset( ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::reset( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().reset( aGuard ); } - void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addUndoManagerListener( i_listener ); } - void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().removeUndoManagerListener( i_listener ); } - void SAL_CALL UndoManager::lock( ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::lock( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().lock(); } - void SAL_CALL UndoManager::unlock( ) throw (NotLockedException, RuntimeException, std::exception) + void SAL_CALL UndoManager::unlock( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().unlock(); } - sal_Bool SAL_CALL UndoManager::isLocked( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL UndoManager::isLocked( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isLocked(); } - Reference< XInterface > SAL_CALL UndoManager::getParent( ) throw (RuntimeException, std::exception) + Reference< XInterface > SAL_CALL UndoManager::getParent( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return *&m_pImpl->getParent(); } - void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException, std::exception) + void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) { 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, std::exception) + void SAL_CALL UndoManager::addModifyListener( const Reference< XModifyListener >& i_listener ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addModifyListener( i_listener ); } - void SAL_CALL UndoManager::removeModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::removeModifyListener( const Reference< XModifyListener >& i_listener ) { 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 8c07a8dcc9e9..47b4e82aca2b 100644 --- a/chart2/source/model/main/UndoManager.hxx +++ b/chart2/source/model/main/UndoManager.hxx @@ -53,36 +53,36 @@ namespace chart void disposing(); // XUndoManager - virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enterHiddenUndoContext( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL leaveUndoContext( ) throw (css::util::InvalidStateException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL undo( ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL redo( ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isUndoPossible( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isRedoPossible( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear( ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearRedo( ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reset( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) override; + virtual void SAL_CALL enterHiddenUndoContext( ) override; + virtual void SAL_CALL leaveUndoContext( ) override; + virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) override; + virtual void SAL_CALL undo( ) override; + virtual void SAL_CALL redo( ) override; + virtual sal_Bool SAL_CALL isUndoPossible( ) override; + virtual sal_Bool SAL_CALL isRedoPossible( ) override; + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) override; + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) override; + virtual void SAL_CALL clear( ) override; + virtual void SAL_CALL clearRedo( ) override; + virtual void SAL_CALL reset( ) override; + virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) override; + virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) override; // XLockable (base of XUndoManager) - virtual void SAL_CALL lock( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlock( ) throw (css::util::NotLockedException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLocked( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lock( ) override; + virtual void SAL_CALL unlock( ) override; + virtual sal_Bool SAL_CALL isLocked( ) override; // XChild (base of XUndoManager) - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; private: std::unique_ptr< impl::UndoManager_Impl > m_pImpl; diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index d47824fef502..dae09c4ac598 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -131,14 +131,12 @@ Wall::~Wall() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL Wall::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new Wall( *this )); } // ____ OPropertySet ____ uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticWallDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -154,14 +152,12 @@ uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL Wall::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticWallInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -175,7 +171,6 @@ void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListen } void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -190,14 +185,12 @@ void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyLis // ____ XModifyListener ____ void SAL_CALL Wall::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index 5a67938c1684..eede7dca5278 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -58,38 +58,31 @@ protected: explicit Wall( const Wall & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index 21d96fac7e9d..163ba7863c7d 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -41,32 +41,27 @@ AreaChartType::~AreaChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new AreaChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL AreaChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_AREA); } OUString SAL_CALL AreaChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.AreaChartType"); } sal_Bool SAL_CALL AreaChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames() - throw( css::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 2a9c99f5cd1d..9cbc090f8e3f 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -31,25 +31,20 @@ public: virtual ~AreaChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit AreaChartType( const AreaChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index d26bc1569ddc..3353d0d752f7 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -130,7 +130,6 @@ AreaChartTypeTemplate::~AreaChartTypeTemplate() // ____ OPropertySet ____ uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticAreaChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -146,7 +145,6 @@ uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL AreaChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticAreaChartTypeTemplateInfo::get(); } @@ -179,14 +177,12 @@ void SAL_CALL AreaChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - 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, std::exception) { ChartTypeTemplate::resetStyles( xDiagram ); ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( @@ -227,7 +223,6 @@ Reference< chart2::XChartType > AreaChartTypeTemplate::getChartTypeForIndex( sal Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index 83d73c1687e6..2fc2f9b0a0d4 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -49,29 +49,24 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence< - css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; virtual void SAL_CALL resetStyles( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; // ____ ChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index 3a61a04dc177..0a05980def8a 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -42,20 +42,17 @@ BarChartType::~BarChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL BarChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new BarChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL BarChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_BAR); } uno::Sequence< OUString > BarChartType::getSupportedPropertyRoles() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aPropRoles(2); aPropRoles[0] = "FillColor"; @@ -65,19 +62,16 @@ uno::Sequence< OUString > BarChartType::getSupportedPropertyRoles() } OUString SAL_CALL BarChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.BarChartType"); } sal_Bool SAL_CALL BarChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames() - throw( css::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 6c79298d6609..0db8a8b7d5d5 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -31,28 +31,22 @@ public: virtual ~BarChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit BarChartType( const BarChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedPropertyRoles() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 1296b5215b05..b06e7bb08746 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -162,7 +162,6 @@ bool BarChartTypeTemplate::isSwapXAndY() const sal_Bool SAL_CALL BarChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException, std::exception) { bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -217,7 +216,6 @@ Reference< chart2::XChartType > BarChartTypeTemplate::getChartTypeForIndex( sal_ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); @@ -226,7 +224,6 @@ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNe // ____ OPropertySet ____ uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticBarChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -242,7 +239,6 @@ uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL BarChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticBarChartTypeTemplateInfo::get(); } @@ -252,7 +248,6 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); @@ -274,7 +269,6 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( void SAL_CALL BarChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - 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 73b98fa1fe56..79b440548356 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -56,33 +56,27 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence< - css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; virtual void SAL_CALL resetStyles( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; // ____ ChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index ba23686d24d7..4af09ba28611 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -110,7 +110,6 @@ BubbleChartType::~BubbleChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL BubbleChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new BubbleChartType( *this )); } @@ -118,8 +117,6 @@ uno::Reference< util::XCloneable > SAL_CALL BubbleChartType::createClone() // ____ XChartType ____ Reference< chart2::XCoordinateSystem > SAL_CALL BubbleChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new CartesianCoordinateSystem( GetComponentContext(), DimensionCount )); @@ -149,13 +146,11 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } OUString SAL_CALL BubbleChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE); } uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aMandRolesSeq(4); aMandRolesSeq[0] = "label"; @@ -166,7 +161,6 @@ uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() } uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedPropertyRoles() - throw(css::uno::RuntimeException, std::exception) { uno::Sequence< OUString > aPropertyRoles(2); aPropertyRoles[0] = "FillColor"; @@ -175,14 +169,12 @@ uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedPropertyRoles() } OUString SAL_CALL BubbleChartType::getRoleOfSequenceForSeriesLabel() - throw (uno::RuntimeException, std::exception) { return OUString("values-size"); } // ____ OPropertySet ____ uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticBubbleChartTypeDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -199,25 +191,21 @@ uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticBubbleChartTypeInfo::get(); } OUString SAL_CALL BubbleChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.BubbleChartType"); } sal_Bool SAL_CALL BubbleChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE, diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index cc0e94406f45..c3248c0b1a4a 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -33,49 +33,37 @@ public: virtual ~BubbleChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit BubbleChartType( const BubbleChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedMandatoryRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedMandatoryRoles() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedPropertyRoles() override; virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL - createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (css::uno::RuntimeException, std::exception) override; + createCoordinateSystem( ::sal_Int32 DimensionCount ) override; + virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index dfda9beab891..78a297305aa1 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -111,7 +111,6 @@ BubbleChartTypeTemplate::~BubbleChartTypeTemplate() // ____ OPropertySet ____ uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticBubbleChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -127,7 +126,6 @@ uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticBubbleChartTypeTemplateInfo::get(); } @@ -147,7 +145,6 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); @@ -155,7 +152,6 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle( // ____ XChartTypeTemplate ____ sal_Bool SAL_CALL BubbleChartTypeTemplate::supportsCategories() - throw (uno::RuntimeException, std::exception) { return false; } @@ -181,7 +177,6 @@ Reference< chart2::XChartType > BubbleChartTypeTemplate::getChartTypeForIndex( s Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -203,7 +198,6 @@ Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeFo } Reference< chart2::XDataInterpreter > SAL_CALL BubbleChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new BubbleDataInterpreter ); diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx index e5e135726f5f..a57b6e4104e4 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx @@ -45,29 +45,23 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ - virtual sal_Bool SAL_CALL supportsCategories() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCategories() override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (css::uno::RuntimeException, std::exception) override; + getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; // ____ ChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 76b202829e75..a43356152f7e 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -50,7 +50,6 @@ 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, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -159,7 +158,6 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { InterpretedData aResult( aInterpretedData ); @@ -270,7 +268,6 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible( const chart2::InterpretedData& aInterpretedData ) - 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 59ad9a821cc1..43921262ed2a 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.hxx +++ b/chart2/source/model/template/BubbleDataInterpreter.hxx @@ -35,14 +35,11 @@ protected: virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( const css::uno::Reference< css::chart2::data::XDataSource >& xSource, const css::uno::Sequence< css::beans::PropertyValue >& aArguments, - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override; virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; virtual sal_Bool SAL_CALL isDataCompatible( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; }; } // namespace chart diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 3062cc2151c7..22c74c5ff7ea 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -206,20 +206,17 @@ CandleStickChartType::~CandleStickChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL CandleStickChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new CandleStickChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL CandleStickChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK); } uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException, std::exception) { bool bShowFirst = true; bool bShowHiLow = false; @@ -244,7 +241,6 @@ uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRo } Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() - throw (uno::RuntimeException, std::exception) { bool bShowFirst = true; bool bShowHiLow = false; @@ -266,14 +262,12 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() } OUString SAL_CALL CandleStickChartType::getRoleOfSequenceForSeriesLabel() - throw (uno::RuntimeException, std::exception) { return OUString("values-last"); } // ____ OPropertySet ____ uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticCandleStickChartTypeDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -290,14 +284,12 @@ uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL CandleStickChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticCandleStickChartTypeInfo::get(); } void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception, std::exception) { if( nHandle == PROP_CANDLESTICKCHARTTYPE_WHITE_DAY || nHandle == PROP_CANDLESTICKCHARTTYPE_BLACK_DAY ) @@ -325,19 +317,16 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( } OUString SAL_CALL CandleStickChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.CandleStickChartType") ; } sal_Bool SAL_CALL CandleStickChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK, diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index 1bbca51d7814..2e9ae89256f7 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -32,33 +32,25 @@ public: virtual ~CandleStickChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit CandleStickChartType( const CandleStickChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedMandatoryRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedMandatoryRoles() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedOptionalRoles() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedOptionalRoles() override; + virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; @@ -66,17 +58,14 @@ protected: // ____ OPropertySet ____ virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index 479e6c1a7190..e17a5344542d 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -71,8 +71,6 @@ ChartType::~ChartType() // ____ XChartType ____ Reference< chart2::XCoordinateSystem > SAL_CALL ChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new CartesianCoordinateSystem( GetComponentContext(), DimensionCount )); @@ -104,7 +102,6 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException, std::exception) { Sequence< OUString > aDefaultSeq(2); aDefaultSeq[0] = "label"; @@ -113,19 +110,16 @@ Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles() } Sequence< OUString > SAL_CALL ChartType::getSupportedOptionalRoles() - throw (uno::RuntimeException, std::exception) { return Sequence< OUString >(); } Sequence< OUString > SAL_CALL ChartType::getSupportedPropertyRoles() - throw (uno::RuntimeException, std::exception) { return Sequence< OUString >(); } OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel() - throw (uno::RuntimeException, std::exception) { return OUString("values-y"); } @@ -143,8 +137,6 @@ void ChartType::impl_addDataSeriesWithoutNotification( // ____ XDataSeriesContainer ____ void SAL_CALL ChartType::addDataSeries( const Reference< chart2::XDataSeries >& xDataSeries ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -153,8 +145,6 @@ void SAL_CALL ChartType::addDataSeries( const Reference< chart2::XDataSeries >& } void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries >& xDataSeries ) - throw (container::NoSuchElementException, - uno::RuntimeException, std::exception) { if( !xDataSeries.is()) throw container::NoSuchElementException(); @@ -175,7 +165,6 @@ void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries } Sequence< Reference< chart2::XDataSeries > > SAL_CALL ChartType::getDataSeries() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -183,8 +172,6 @@ Sequence< Reference< chart2::XDataSeries > > SAL_CALL ChartType::getDataSeries() } void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XDataSeries > >& aDataSeries ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -210,7 +197,6 @@ void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XData // ____ OPropertySet ____ uno::Any ChartType::GetDefaultValue( sal_Int32 /* nHandle */ ) const - throw(beans::UnknownPropertyException) { return uno::Any(); } @@ -255,14 +241,12 @@ struct StaticChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans: // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticChartTypeInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -276,7 +260,6 @@ void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyL } void SAL_CALL ChartType::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -291,14 +274,12 @@ void SAL_CALL ChartType::removeModifyListener( const uno::Reference< util::XModi // ____ XModifyListener ____ void SAL_CALL ChartType::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index ef702bc71e46..f239f7f38824 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -67,63 +67,44 @@ protected: // ____ XChartType ____ // still abstract ! implement ! - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override = 0; + virtual OUString SAL_CALL getChartType() override = 0; virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL - createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + createCoordinateSystem( ::sal_Int32 DimensionCount ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedMandatoryRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedMandatoryRoles() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedOptionalRoles() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedOptionalRoles() override; + virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedPropertyRoles() override; // ____ XDataSeriesContainer ____ virtual void SAL_CALL addDataSeries( - const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ) override; virtual void SAL_CALL removeDataSeries( - const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > SAL_CALL getDataSeries() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > SAL_CALL getDataSeries() override; virtual void SAL_CALL setDataSeries( - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aDataSeries ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aDataSeries ) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; void fireModifyEvent(); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual void firePropertyChangeEvent() override; @@ -131,8 +112,7 @@ protected: // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 664f3e2eeaa4..08eba875e4b0 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -235,8 +235,6 @@ ChartTypeManager::~ChartTypeManager() // ____ XMultiServiceFactory ____ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( const OUString& aServiceSpecifier ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; TemplateId nId = lcl_GetTemplateIdForService( aServiceSpecifier ); @@ -558,15 +556,12 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& /* Arguments */ ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { OSL_FAIL( "createInstanceWithArguments: No arguments supported" ); return createInstance( ServiceSpecifier ); } uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() - throw (uno::RuntimeException, std::exception) { ::std::vector< OUString > aServices; const tTemplateMapType & rMap = lcl_DefaultChartTypeMap(); @@ -604,19 +599,16 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() // ____ XServiceInfo ____ OUString SAL_CALL ChartTypeManager::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ChartTypeManager"); } sal_Bool SAL_CALL ChartTypeManager::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartTypeManager::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.ChartTypeManager", diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 06915bab71ec..da1cfefda6bf 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -139,7 +139,6 @@ ChartTypeTemplate::~ChartTypeTemplate() uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource( const uno::Reference< data::XDataSource >& xDataSource, const uno::Sequence< beans::PropertyValue >& aArguments ) - throw (uno::RuntimeException, std::exception) { Reference< XDiagram > xDia; @@ -178,13 +177,11 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource } sal_Bool SAL_CALL ChartTypeTemplate::supportsCategories() - throw (css::uno::RuntimeException, ::std::exception) { return true; } void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { if( ! xDiagram.is()) return; @@ -262,7 +259,6 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData( const Reference< chart2::XDiagram >& xDiagram, const Reference< chart2::data::XDataSource >& xDataSource, const Sequence< beans::PropertyValue >& aArguments ) - throw (uno::RuntimeException, std::exception) { if( ! (xDiagram.is() && xDataSource.is()) ) @@ -313,7 +309,6 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData( sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool /* bAdaptProperties */ ) - throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -373,7 +368,6 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate( } Reference< chart2::XDataInterpreter > SAL_CALL ChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new DataInterpreter ); @@ -386,7 +380,6 @@ void SAL_CALL ChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 /* nSeriesIndex */, ::sal_Int32 /* nSeriesCount */ ) - throw (uno::RuntimeException, std::exception) { // sset stacking mode Reference< beans::XPropertySet > xSeriesProp( xSeries, uno::UNO_QUERY ); @@ -424,7 +417,6 @@ void SAL_CALL ChartTypeTemplate::applyStyle( } void SAL_CALL ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException) { // apply chart-type specific styles, like "symbols on" for example Sequence< Sequence< Reference< XDataSeries > > > aNewSeriesSeq( @@ -441,7 +433,6 @@ void SAL_CALL ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram } void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { // reset number format if we had percent stacking on bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT); @@ -521,7 +512,6 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram // ____ XServiceName ____ OUString SAL_CALL ChartTypeTemplate::getServiceName() - 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 6bc9fae1efc6..c32fcbd7934a 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -82,46 +82,36 @@ protected: // ____ XChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL createDiagramByDataSource( const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource, - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; /// denotes if the chart needs categories at the first scale - virtual sal_Bool SAL_CALL supportsCategories() - throw (css::uno::RuntimeException, ::std::exception) override; + virtual sal_Bool SAL_CALL supportsCategories() override; virtual void SAL_CALL changeDiagram( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; virtual void SAL_CALL changeDiagramData( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource, - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; // still abstract: getChartTypeForNewSeries() - virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; virtual void SAL_CALL resetStyles( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; /// @throws css::uno::RuntimeException void SAL_CALL applyStyles( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException); + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; // Methods to override for automatic creation diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 3b6f23cca403..84c6054badbd 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -140,20 +140,17 @@ ColumnChartType::~ColumnChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL ColumnChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ColumnChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL ColumnChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN); } uno::Sequence< OUString > ColumnChartType::getSupportedPropertyRoles() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aPropRoles(2); aPropRoles[0] = "FillColor"; @@ -164,7 +161,6 @@ uno::Sequence< OUString > ColumnChartType::getSupportedPropertyRoles() // ____ OPropertySet ____ uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticColumnChartTypeDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -180,25 +176,21 @@ uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticColumnChartTypeInfo::get(); } OUString SAL_CALL ColumnChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ColumnChartType"); } sal_Bool SAL_CALL ColumnChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_COLUMN, diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index f37f845c7ee4..5f2aaea15b14 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -31,38 +31,30 @@ public: virtual ~ColumnChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit ColumnChartType( const ColumnChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedPropertyRoles() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 4868df4d4754..9809cd0f0845 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -135,7 +135,6 @@ ColumnLineChartTypeTemplate::~ColumnLineChartTypeTemplate() // ____ OPropertySet ____ uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticColumnLineChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -151,7 +150,6 @@ uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnLineChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticColumnLineChartTypeTemplateInfo::get(); } @@ -239,7 +237,6 @@ void SAL_CALL ColumnLineChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -270,7 +267,6 @@ StackMode ColumnLineChartTypeTemplate::getStackMode( sal_Int32 nChartTypeIndex ) sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate( const uno::Reference< XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -367,7 +363,6 @@ Reference< chart2::XChartType > ColumnLineChartTypeTemplate::getChartTypeForInde Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -388,7 +383,6 @@ Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNew } Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInterpreter() - 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 80a15444d598..8dcd13461fa6 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -49,32 +49,26 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence< - css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override; // ____ ChartTypeTemplate ____ virtual void createChartTypes( diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index 3f41a7016664..735ca0ba976d 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -54,7 +54,6 @@ InterpretedData SAL_CALL ColumnLineDataInterpreter::interpretDataSource( const Reference< data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& aArguments, const Sequence< Reference< XDataSeries > >& aSeriesToReUse ) - 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 5d113be6b029..e6956db4cd30 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx @@ -36,8 +36,7 @@ protected: virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( const css::uno::Reference< css::chart2::data::XDataSource >& xSource, const css::uno::Sequence< css::beans::PropertyValue >& aArguments, - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override; private: sal_Int32 m_nNumberOfLines; diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 052fe51ae75d..d3e7c85f5352 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -59,7 +59,6 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( const Reference< data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& aArguments, const Sequence< Reference< XDataSeries > >& aSeriesToReUse ) - throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -134,7 +133,6 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { InterpretedData aResult( aInterpretedData ); @@ -191,7 +189,6 @@ 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, std::exception) { Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); for( sal_Int32 i=0; i<aSeries.getLength(); ++i ) @@ -267,7 +264,6 @@ private: Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { vector< Reference< data::XLabeledDataSequence > > aResultVec; aResultVec.reserve( aInterpretedData.Series.getLength() + @@ -378,19 +374,16 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > & } OUString SAL_CALL DataInterpreter::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.DataInterpreter"); } sal_Bool SAL_CALL DataInterpreter::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DataInterpreter::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.DataInterpreter" }; } diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index 15bd9589c3f2..5306146a6b34 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -36,12 +36,9 @@ public: virtual ~DataInterpreter() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // convenience methods static OUString GetRole( const css::uno::Reference< css::chart2::data::XDataSequence > & xSeq ); @@ -66,17 +63,13 @@ protected: virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( const css::uno::Reference< css::chart2::data::XDataSource >& xSource, const css::uno::Sequence< css::beans::PropertyValue >& aArguments, - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override; virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; virtual sal_Bool SAL_CALL isDataCompatible( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL mergeInterpretedData( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; }; } // namespace chart diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 661805a4a474..39e7b2f34c11 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -50,32 +50,27 @@ FilledNetChartType::~FilledNetChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL FilledNetChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new FilledNetChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL FilledNetChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET); } OUString SAL_CALL FilledNetChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.FilledNetChartType"); } sal_Bool SAL_CALL FilledNetChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL FilledNetChartType::getSupportedServiceNames() - throw( css::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 e308258426ae..49fc980d1078 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -31,25 +31,20 @@ public: virtual ~FilledNetChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit FilledNetChartType( const FilledNetChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx index f18c9c941b23..0e45c8d8d6fe 100644 --- a/chart2/source/model/template/GL3DBarChartType.cxx +++ b/chart2/source/model/template/GL3DBarChartType.cxx @@ -102,19 +102,16 @@ GL3DBarChartType::GL3DBarChartType( const GL3DBarChartType& rOther ) : GL3DBarChartType::~GL3DBarChartType() {} OUString SAL_CALL GL3DBarChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.GL3DBarChartType"); } sal_Bool SAL_CALL GL3DBarChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL GL3DBarChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR, @@ -123,13 +120,11 @@ css::uno::Sequence< OUString > SAL_CALL GL3DBarChartType::getSupportedServiceNam } OUString SAL_CALL GL3DBarChartType::getChartType() - throw (css::uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR); } uno::Sequence<OUString> GL3DBarChartType::getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) { uno::Sequence< OUString > aPropRoles { "FillColor" }; @@ -138,13 +133,11 @@ uno::Sequence<OUString> GL3DBarChartType::getSupportedPropertyRoles() css::uno::Reference<css::util::XCloneable> GL3DBarChartType::createClone() - throw (css::uno::RuntimeException, std::exception) { return uno::Reference<util::XCloneable>(new GL3DBarChartType(*this)); } css::uno::Any GL3DBarChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException) { const tPropertyValueMap& rDefaults = *Defaults::get(); tPropertyValueMap::const_iterator it = rDefaults.find(nHandle); @@ -157,7 +150,6 @@ cppu::IPropertyArrayHelper& GL3DBarChartType::getInfoHelper() } css::uno::Reference<css::beans::XPropertySetInfo> GL3DBarChartType::getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) { return *ChartTypeInfo::get(); } diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index 939b9819516c..75a156988507 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -25,38 +25,30 @@ public: virtual ~GL3DBarChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedPropertyRoles() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: GL3DBarChartType( const GL3DBarChartType& rOther ); - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Reference<css::util::XCloneable> SAL_CALL - createClone() - throw (css::uno::RuntimeException, std::exception) override; + createClone() override; // OPropertySet - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; }; } diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx index 51ccde36f3e9..c8cf9b490efa 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx @@ -128,7 +128,6 @@ uno::Reference<chart2::XChartType> GL3DBarChartTypeTemplate::getChartTypeForInde sal_Bool SAL_CALL GL3DBarChartTypeTemplate::matchesTemplate( const css::uno::Reference<css::chart2::XDiagram>& xDiagram, sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) { bool bResult = ChartTypeTemplate::matchesTemplate(xDiagram, bAdaptProperties); @@ -148,7 +147,6 @@ sal_Bool SAL_CALL GL3DBarChartTypeTemplate::matchesTemplate( uno::Reference<chart2::XChartType> GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Reference<chart2::XChartType> >& /*xOldChartTypes*/ ) - throw (css::uno::RuntimeException, ::std::exception) { uno::Reference<chart2::XChartType> xResult; @@ -170,13 +168,11 @@ GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Ref } sal_Bool GL3DBarChartTypeTemplate::supportsCategories() - throw (css::uno::RuntimeException, ::std::exception) { return false; } css::uno::Any GL3DBarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException) { const tPropertyValueMap& rDefaults = *Defaults::get(); tPropertyValueMap::const_iterator it = rDefaults.find(nHandle); @@ -189,7 +185,6 @@ cppu::IPropertyArrayHelper& GL3DBarChartTypeTemplate::getInfoHelper() } css::uno::Reference<css::beans::XPropertySetInfo> GL3DBarChartTypeTemplate::getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) { return *ChartTypeInfo::get(); } diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx index baa781459d1a..6db19deb9989 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx @@ -38,26 +38,21 @@ public: virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference<css::chart2::XDiagram>& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference<css::chart2::XChartType> SAL_CALL - getChartTypeForNewSeries( const css::uno::Sequence<css::uno::Reference<css::chart2::XChartType> >& xOldChartTypes ) - throw (css::uno::RuntimeException, ::std::exception) override; + getChartTypeForNewSeries( const css::uno::Sequence<css::uno::Reference<css::chart2::XChartType> >& xOldChartTypes ) override; - virtual sal_Bool SAL_CALL supportsCategories() - throw (css::uno::RuntimeException, ::std::exception) override; + virtual sal_Bool SAL_CALL supportsCategories() override; // OPropertySet - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; }; } diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index db1a2bd2f748..c1af371763c5 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -151,21 +151,18 @@ LineChartType::~LineChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL LineChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LineChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL LineChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_LINE); } // ____ OPropertySet ____ uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticLineChartTypeDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -181,25 +178,21 @@ uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticLineChartTypeInfo::get(); } OUString SAL_CALL LineChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.LineChartType"); } sal_Bool SAL_CALL LineChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LineChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_LINE, diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index fa7e2b405d4a..d001b72bf424 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -32,35 +32,28 @@ public: virtual ~LineChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit LineChartType( const LineChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 8c988c529190..759a5aa7fe86 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -164,7 +164,6 @@ LineChartTypeTemplate::~LineChartTypeTemplate() {} // ____ OPropertySet ____ uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticLineChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -180,7 +179,6 @@ uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticLineChartTypeTemplateInfo::get(); } @@ -199,7 +197,6 @@ StackMode LineChartTypeTemplate::getStackMode( sal_Int32 /* nChartTypeIndex */ ) sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( const uno::Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException, std::exception) { bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -317,7 +314,6 @@ Reference< chart2::XChartType > LineChartTypeTemplate::getChartTypeForIndex( sal Reference< chart2::XChartType > SAL_CALL LineChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -354,7 +350,6 @@ void SAL_CALL LineChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - 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 1a1364bfb8f2..55fc7797ec87 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -51,29 +51,24 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; + getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; // ____ ChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index b079b87e7360..c3310f297f3b 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -54,8 +54,6 @@ NetChartType_Base::~NetChartType_Base() Reference< XCoordinateSystem > SAL_CALL NetChartType_Base::createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( DimensionCount != 2 ) throw lang::IllegalArgumentException( @@ -89,7 +87,6 @@ Reference< XCoordinateSystem > SAL_CALL // ____ OPropertySet ____ uno::Any NetChartType_Base::GetDefaultValue( sal_Int32 /*nHandle*/ ) const - throw(beans::UnknownPropertyException) { return uno::Any(); } @@ -134,7 +131,6 @@ struct StaticNetChartTypeInfo : public rtl::StaticAggregate< uno::Reference< bea // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL NetChartType_Base::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticNetChartTypeInfo::get(); } @@ -154,32 +150,27 @@ NetChartType::~NetChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL NetChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new NetChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL NetChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_NET); } OUString SAL_CALL NetChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.NetChartType"); } sal_Bool SAL_CALL NetChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL NetChartType::getSupportedServiceNames() - throw( css::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 b12a4cc3e78c..61a5d4fa184c 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -35,20 +35,16 @@ protected: // ____ XChartType ____ virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL - createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + createCoordinateSystem( ::sal_Int32 DimensionCount ) override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; }; class NetChartType : public NetChartType_Base @@ -58,25 +54,20 @@ public: virtual ~NetChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit NetChartType( const NetChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 0b06f66c1b1f..a12dccf3a574 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -62,7 +62,6 @@ void SAL_CALL NetChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -84,7 +83,6 @@ void SAL_CALL NetChartTypeTemplate::applyStyle( sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException, std::exception) { bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -185,7 +183,6 @@ Reference< chart2::XChartType > NetChartTypeTemplate::getChartTypeForIndex( sal_ Reference< chart2::XChartType > SAL_CALL NetChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index f6eca07f400b..8ba47c2f9905 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -42,17 +42,14 @@ protected: // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; + getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; // ____ ChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 70badb000b23..c758d67353ad 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -140,22 +140,18 @@ PieChartType::~PieChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL PieChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PieChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL PieChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_PIE); } Reference< chart2::XCoordinateSystem > SAL_CALL PieChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new PolarCoordinateSystem( GetComponentContext(), DimensionCount )); @@ -190,7 +186,6 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } uno::Sequence< OUString > PieChartType::getSupportedPropertyRoles() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aPropRoles(2); aPropRoles[0] = "FillColor"; @@ -201,7 +196,6 @@ uno::Sequence< OUString > PieChartType::getSupportedPropertyRoles() // ____ OPropertySet ____ uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticPieChartTypeDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -218,25 +212,21 @@ uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticPieChartTypeInfo::get(); } OUString SAL_CALL PieChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.PieChartType"); } sal_Bool SAL_CALL PieChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PieChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_PIE, diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index f67987073cba..86509405b313 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -32,44 +32,34 @@ public: virtual ~PieChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit PieChartType( const PieChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL - createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + createCoordinateSystem( ::sal_Int32 DimensionCount ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedPropertyRoles() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index cd296affe968..0144b54a6924 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -170,7 +170,6 @@ PieChartTypeTemplate::~PieChartTypeTemplate() // ____ OPropertySet ____ uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticPieChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -186,7 +185,6 @@ uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticPieChartTypeTemplateInfo::get(); } @@ -306,7 +304,6 @@ void PieChartTypeTemplate::createChartTypes( sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate( const uno::Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException, std::exception) { bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -417,7 +414,6 @@ Reference< chart2::XChartType > PieChartTypeTemplate::getChartTypeForIndex( sal_ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -449,7 +445,6 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -536,7 +531,6 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( } void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - 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 5940ba610b2a..640ba6c20b7e 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -50,33 +50,27 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence< - css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; virtual void SAL_CALL resetStyles( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; // ____ ChartTypeTemplate ____ virtual sal_Int32 getDimension() const override; diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index f178d5383ebb..922dfb90f26f 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -168,7 +168,6 @@ ScatterChartType::~ScatterChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ScatterChartType( *this )); } @@ -176,8 +175,6 @@ uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone() // ____ XChartType ____ Reference< chart2::XCoordinateSystem > SAL_CALL ScatterChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new CartesianCoordinateSystem( GetComponentContext(), DimensionCount )); @@ -207,13 +204,11 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } OUString SAL_CALL ScatterChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER); } uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aMandRolesSeq(3); aMandRolesSeq[0] = "label"; @@ -224,7 +219,6 @@ uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles( // ____ OPropertySet ____ uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticScatterChartTypeDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -241,25 +235,21 @@ uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticScatterChartTypeInfo::get(); } OUString SAL_CALL ScatterChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ScatterChartType"); } sal_Bool SAL_CALL ScatterChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_SCATTER, diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 64ea32e308aa..a09a840224ab 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -36,44 +36,34 @@ public: virtual ~ScatterChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit ScatterChartType( const ScatterChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedMandatoryRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedMandatoryRoles() override; virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL - createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + createCoordinateSystem( ::sal_Int32 DimensionCount ) override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 3f98f72fa2c7..bde601008446 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -165,7 +165,6 @@ ScatterChartTypeTemplate::~ScatterChartTypeTemplate() // ____ OPropertySet ____ uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticScatterChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -181,7 +180,6 @@ uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticScatterChartTypeTemplateInfo::get(); } @@ -203,7 +201,6 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -225,7 +222,6 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle( // ____ XChartTypeTemplate ____ sal_Bool SAL_CALL ScatterChartTypeTemplate::supportsCategories() - throw (uno::RuntimeException, std::exception) { return false; } @@ -233,7 +229,6 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::supportsCategories() sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException, std::exception) { bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -351,7 +346,6 @@ Reference< chart2::XChartType > ScatterChartTypeTemplate::getChartTypeForIndex( Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -384,7 +378,6 @@ Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeF } Reference< chart2::XDataInterpreter > SAL_CALL ScatterChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new XYDataInterpreter ); diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index 65ae965bc284..18829d0ea5da 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -49,34 +49,27 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ - virtual sal_Bool SAL_CALL supportsCategories() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCategories() override; virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence< - css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; // ____ ChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index aa4d41b48673..3b58a76aa969 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -178,7 +178,6 @@ StockChartTypeTemplate::~StockChartTypeTemplate() {} // ____ OPropertySet ____ uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticStockChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -194,7 +193,6 @@ uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL StockChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticStockChartTypeTemplateInfo::get(); } @@ -220,7 +218,6 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); try @@ -265,7 +262,6 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( void SAL_CALL StockChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::resetStyles( xDiagram ); if( getDimension() == 3 ) @@ -403,7 +399,6 @@ void StockChartTypeTemplate::createChartTypes( sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( const uno::Reference< XDiagram >& xDiagram, sal_Bool /* bAdaptProperties */ ) - throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -484,7 +479,6 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -505,7 +499,6 @@ Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSerie } Reference< XDataInterpreter > SAL_CALL StockChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new StockDataInterpreter( m_eStockVariant ) ); diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index 2a04ba2bec6a..f4884ac462e7 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -63,36 +63,29 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< - css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (css::uno::RuntimeException, std::exception) override; + css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; virtual void SAL_CALL resetStyles( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; // ChartTypeTemplate virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension ) override; diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index 2e2f5c0bbbd7..b1844f1da84a 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -54,7 +54,6 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( const Reference< data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& rArguments, const Sequence< Reference< XDataSeries > >& rSeriesToReUse ) - throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -262,7 +261,6 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( // volume to one with volume) sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { // high/low/close sal_Int32 nNumberOfNecessarySequences = 3; @@ -319,7 +317,6 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( InterpretedData SAL_CALL StockDataInterpreter::reinterpretDataSeries( const InterpretedData& aInterpretedData ) - 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 0fb4df9acd7f..2bd5b2b61976 100644 --- a/chart2/source/model/template/StockDataInterpreter.hxx +++ b/chart2/source/model/template/StockDataInterpreter.hxx @@ -38,14 +38,11 @@ protected: virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( const css::uno::Reference< css::chart2::data::XDataSource >& xSource, const css::uno::Sequence< css::beans::PropertyValue >& aArguments, - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override; virtual sal_Bool SAL_CALL isDataCompatible( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; private: StockChartTypeTemplate::StockVariant m_eStockVariant; diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index 1ecce05b21a2..c0d05a60ca98 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -50,7 +50,6 @@ 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, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -143,7 +142,6 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { InterpretedData aResult( aInterpretedData ); @@ -232,7 +230,6 @@ 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, 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 5b730c45e745..c57889ce880d 100644 --- a/chart2/source/model/template/XYDataInterpreter.hxx +++ b/chart2/source/model/template/XYDataInterpreter.hxx @@ -35,14 +35,11 @@ protected: virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( const css::uno::Reference< css::chart2::data::XDataSource >& xSource, const css::uno::Sequence< css::beans::PropertyValue >& aArguments, - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override; virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; virtual sal_Bool SAL_CALL isDataCompatible( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; }; } // namespace chart diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 14792358c3b1..c702a1ab2489 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -226,7 +226,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( CachedDataSequence, CachedDataSequence_Base, O // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } @@ -248,19 +247,16 @@ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySet } OUString SAL_CALL CachedDataSequence::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName); } sal_Bool SAL_CALL CachedDataSequence::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CachedDataSequence::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, @@ -272,7 +268,6 @@ css::uno::Sequence< OUString > SAL_CALL CachedDataSequence::getSupportedServiceN // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -284,7 +279,6 @@ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() // ________ XTextualDataSequence ________ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -296,34 +290,28 @@ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData() // ________ XDataSequence ________ Sequence< Any > SAL_CALL CachedDataSequence::getData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return Impl_getMixedData(); } OUString SAL_CALL CachedDataSequence::getSourceRangeRepresentation() - throw (uno::RuntimeException, std::exception) { return m_sRole; } Sequence< OUString > SAL_CALL CachedDataSequence::generateLabel( chart2::data::LabelOrigin /*eLabelOrigin*/ ) - throw (uno::RuntimeException, std::exception) { // return empty label, as we have no range representaions to determine something useful return Sequence< OUString >(); } ::sal_Int32 SAL_CALL CachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 /*nIndex*/ ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { return 0; } Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone() - throw (uno::RuntimeException, std::exception) { CachedDataSequence * pNewSeq = new CachedDataSequence( *this ); @@ -331,7 +319,6 @@ Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone() } void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -345,7 +332,6 @@ void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XMod } void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -359,7 +345,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, std::exception) +void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) { ::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 e1b842dda7ac..2926cc0eabf2 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -139,7 +139,6 @@ void ConfigColorScheme::retrieveConfigColors() // ____ XColorScheme ____ ::sal_Int32 SAL_CALL ConfigColorScheme::getColorByIndex( ::sal_Int32 nIndex ) - throw (uno::RuntimeException, std::exception) { if( m_bNeedsUpdate ) retrieveConfigColors(); @@ -166,19 +165,16 @@ void ConfigColorScheme::notify( const OUString & rPropertyName ) } OUString SAL_CALL ConfigColorScheme::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.ConfigDefaultColorScheme") ; } sal_Bool SAL_CALL ConfigColorScheme::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ConfigColorScheme::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.ColorScheme" }; } diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 16c18ddb8e2b..dc1122e6eca2 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -45,32 +45,27 @@ DataSource::~DataSource() // ____ XDataSource ____ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSource::getDataSequences() - throw (uno::RuntimeException, std::exception) { return m_aDataSeq; } // ____ XDataSink ____ void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException, std::exception) { m_aDataSeq = aData; } OUString SAL_CALL DataSource::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.DataSource"); } sal_Bool SAL_CALL DataSource::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DataSource::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.data.DataSource" }; } diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index aa4573df29df..d717d09dca98 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -129,14 +129,12 @@ ErrorBar::~ErrorBar() {} uno::Reference< util::XCloneable > SAL_CALL ErrorBar::createClone() - 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, std::exception) { static uno::Reference< beans::XPropertySetInfo > aRef ( new SfxItemPropertySetInfo( GetErrorBarPropertySet()->getPropertyMap() ) ); @@ -144,8 +142,6 @@ 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, std::exception) { SolarMutexGuard aGuard; @@ -228,7 +224,6 @@ OUString getSourceRangeStrFromLabeledSequences( const uno::Sequence< uno::Refere } uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -293,7 +288,6 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) } beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) - throw (css::beans::UnknownPropertyException, std::exception) { if(rPropName == "ErrorBarStyle") { @@ -364,7 +358,6 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) } uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Sequence< OUString >& rPropNames ) - throw (css::beans::UnknownPropertyException, std::exception) { uno::Sequence< beans::PropertyState > aRet( rPropNames.getLength() ); for(sal_Int32 i = 0; i < rPropNames.getLength(); ++i) @@ -375,41 +368,34 @@ uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Se } void ErrorBar::setPropertyToDefault( const OUString& ) - throw (beans::UnknownPropertyException, std::exception) { //keep them unimplemented for now } uno::Any ErrorBar::getPropertyDefault( const OUString& ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, std::exception) { //keep them unimplemented for now return uno::Any(); } void ErrorBar::addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } void ErrorBar::removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } void ErrorBar::addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } void ErrorBar::removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } // ____ XModifyBroadcaster ____ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -423,7 +409,6 @@ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyLi } void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -438,21 +423,18 @@ void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModif // ____ XModifyListener ____ void SAL_CALL ErrorBar::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } // ____ XDataSink ____ void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException, std::exception) { ModifyListenerHelper::removeListenerFromAllElements( m_aDataSequences, m_xModifyEventForwarder ); EventListenerHelper::removeListenerFromAllElements( m_aDataSequences, this ); @@ -463,25 +445,21 @@ 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, std::exception) { return comphelper::containerToSequence( m_aDataSequences ); } OUString SAL_CALL ErrorBar::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName); } sal_Bool SAL_CALL ErrorBar::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ErrorBar::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index d620576d3e30..b1439867a449 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -46,7 +46,6 @@ ExponentialRegressionCurveCalculator::~ExponentialRegressionCurveCalculator() void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -113,8 +112,6 @@ void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression( } double SAL_CALL ExponentialRegressionCurveCalculator::getCurveValue( double x ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -133,8 +130,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL ExponentialRegressionCurveCalcul const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLinearScaling( xScalingX ) && diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 9f5f3187fd36..f14810a9e64b 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -653,7 +653,6 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::createDataSequenc // ____ XDataProvider ____ sal_Bool SAL_CALL InternalDataProvider::createDataSourcePossible( const Sequence< beans::PropertyValue >& /* aArguments */ ) - throw (uno::RuntimeException, std::exception) { return true; } @@ -678,8 +677,6 @@ 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, std::exception) { OUString aRangeRepresentation; bool bUseColumns = true; @@ -769,7 +766,6 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( const Reference< chart2::data::XDataSource >& /* xDataSource */ ) - throw (uno::RuntimeException, std::exception) { Sequence< beans::PropertyValue > aArguments( 4 ); aArguments[0] = beans::PropertyValue( @@ -794,15 +790,12 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( } sal_Bool SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& /* aRangeRepresentation */ ) - throw (uno::RuntimeException, std::exception) { return true; } Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( aRangeRepresentation.match( lcl_aCategoriesRangeName )) { @@ -836,13 +829,11 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa Reference<chart2::data::XDataSequence> SAL_CALL InternalDataProvider::createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return createDataSequenceFromArray(aRangeRepresentation, aRole); } Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelection() - throw (uno::RuntimeException, std::exception) { // there is no range selection component return Reference< sheet::XRangeSelection >(); @@ -850,7 +841,6 @@ Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelec // ____ XInternalDataProvider ____ sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUString& aRange ) - throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -874,7 +864,6 @@ sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUSt } Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation( const OUString& aRange ) - throw (uno::RuntimeException, std::exception) { Sequence< uno::Any > aResult; @@ -948,7 +937,6 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( const OUString& aRange, const Sequence< uno::Any >& aNewData ) - throw (uno::RuntimeException, std::exception) { vector< uno::Any > aNewVector( ContainerHelper::SequenceToVector(aNewData) ); if( aRange.match( lcl_aLabelRangePrefix ) ) @@ -1014,7 +1002,6 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( } void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex ) - throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) { @@ -1029,7 +1016,6 @@ void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex ) } void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException, std::exception) { deleteMapReferences( OUString::number( nAtIndex )); deleteMapReferences( lcl_aLabelRangePrefix + OUString::number( nAtIndex )); @@ -1046,7 +1032,6 @@ void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex ) } void SAL_CALL InternalDataProvider::appendSequence() - throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) m_aInternalData.appendColumn(); @@ -1055,7 +1040,6 @@ void SAL_CALL InternalDataProvider::appendSequence() } void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel ) - 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 ) @@ -1072,7 +1056,6 @@ void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel } } void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel ) - 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 ) @@ -1090,7 +1073,6 @@ void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel } void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) - throw (uno::RuntimeException, std::exception) { sal_Int32 nMaxRep = 0; if( m_bDataInColumns ) @@ -1114,7 +1096,6 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 } void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException, std::exception) { sal_Int32 nMaxRep = 0; if( m_bDataInColumns ) @@ -1138,7 +1119,6 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 } void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) m_aInternalData.swapRowWithNext( nAtIndex ); @@ -1158,7 +1138,6 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s } void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Reference< chart2::data::XDataSequence >& xSeq ) - throw (uno::RuntimeException, std::exception) { if( xSeq.is()) addDataSequenceToMap( xSeq->getSourceRangeRepresentation(), xSeq ); @@ -1166,8 +1145,6 @@ void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Refere // ____ XRangeXMLConversion ____ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRangeRepresentation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { XMLRangeHelper::CellRange aRange; aRange.aTableName = "local-table"; @@ -1244,8 +1221,6 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang } OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXMLRange ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { XMLRangeHelper::CellRange aRange( XMLRangeHelper::getCellRangeFromXMLString( aXMLRange )); if( aRange.aUpperLeft.bIsEmpty ) @@ -1372,7 +1347,7 @@ uno::Sequence< OUString > SplitCategoriesProvider_ForComplexDescriptions::getStr }//anonymous namespace // ____ XDateCategories ____ -Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno::RuntimeException, std::exception) +Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() { double fNan = InternalDataProvider::getNotANumber(); double fValue = fNan; @@ -1390,7 +1365,7 @@ Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno return aDoubles; } -void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) { sal_Int32 nCount = rDates.getLength(); vector< vector< uno::Any > > aNewCategories; @@ -1410,56 +1385,53 @@ void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& } // ____ XAnyDescriptionAccess ____ -Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() { return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexRowLabels() ); } -void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) { m_aInternalData.setComplexRowLabels( lcl_convertSequenceSequenceToVectorVector( aRowDescriptions ) ); } -Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() { return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexColumnLabels() ); } -void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) { m_aInternalData.setComplexColumnLabels( lcl_convertSequenceSequenceToVectorVector( aColumnDescriptions ) ); } // ____ XComplexDescriptionAccess ____ -Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() { return comphelper::containerToSequence(lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexRowLabels() )); } -void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) { m_aInternalData.setComplexRowLabels( lcl_convertComplexStringSequenceToAnyVector(aRowDescriptions) ); } -Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() { return comphelper::containerToSequence(lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexColumnLabels() )); } -void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) { m_aInternalData.setComplexColumnLabels( lcl_convertComplexStringSequenceToAnyVector(aColumnDescriptions) ); } // ____ XChartDataArray ____ Sequence< Sequence< double > > SAL_CALL InternalDataProvider::getData() - throw (uno::RuntimeException, std::exception) { return m_aInternalData.getData(); } void SAL_CALL InternalDataProvider::setData( const Sequence< Sequence< double > >& rDataInRows ) - throw (uno::RuntimeException, std::exception) { return m_aInternalData.setData( rDataInRows ); } void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString >& aRowDescriptions ) - throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexDescriptions( aRowDescriptions.getLength() ); transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aRowDescriptions.getConstArray(), @@ -1468,7 +1440,6 @@ void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString } void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUString >& aColumnDescriptions ) - throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexDescriptions( aColumnDescriptions.getLength() ); transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aColumnDescriptions.getConstArray(), @@ -1477,7 +1448,6 @@ void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUStr } Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions() - throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexRowLabels() ); SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels ); @@ -1485,7 +1455,6 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions() } Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions() - throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexColumnLabels() ); SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels ); @@ -1495,18 +1464,15 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions() // ____ XChartData (base of XChartDataArray) ____ void SAL_CALL InternalDataProvider::addChartDataChangeEventListener( const Reference< css::chart::XChartDataChangeEventListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL InternalDataProvider::removeChartDataChangeEventListener( const Reference< css::chart::XChartDataChangeEventListener >& ) - throw (uno::RuntimeException, std::exception) { } double SAL_CALL InternalDataProvider::getNotANumber() - throw (uno::RuntimeException, std::exception) { double fNan; ::rtl::math::setNan( & fNan ); @@ -1514,13 +1480,12 @@ double SAL_CALL InternalDataProvider::getNotANumber() } sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber ) - 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, std::exception) +void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) { comphelper::SequenceAsHashMap aArgs(_aArguments); if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData", false ) ) @@ -1529,26 +1494,22 @@ void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone() - throw (uno::RuntimeException, std::exception) { return Reference< util::XCloneable >( new InternalDataProvider( *this )); } OUString SAL_CALL InternalDataProvider::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { // note: in xmloff this name is used to indicate usage of own data return OUString("com.sun.star.comp.chart.InternalDataProvider"); } sal_Bool SAL_CALL InternalDataProvider::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL InternalDataProvider::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.data.DataProvider" }; } diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index d5c45694d9c6..279db333e066 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -66,14 +66,12 @@ LabeledDataSequence::~LabeledDataSequence() // ____ XLabeledDataSequence ____ uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getValues() - throw (uno::RuntimeException, std::exception) { return m_xData; } void SAL_CALL LabeledDataSequence::setValues( const uno::Reference< chart2::data::XDataSequence >& xSequence ) - throw (uno::RuntimeException, std::exception) { if( m_xData != xSequence ) { @@ -84,14 +82,12 @@ void SAL_CALL LabeledDataSequence::setValues( } uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getLabel() - throw (uno::RuntimeException, std::exception) { return m_xLabel; } void SAL_CALL LabeledDataSequence::setLabel( const uno::Reference< chart2::data::XDataSequence >& xSequence ) - throw (uno::RuntimeException, std::exception) { if( m_xLabel != xSequence ) { @@ -103,7 +99,6 @@ void SAL_CALL LabeledDataSequence::setLabel( // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone() - throw (uno::RuntimeException, std::exception) { uno::Reference< chart2::data::XDataSequence > xNewValues( m_xData ); uno::Reference< chart2::data::XDataSequence > xNewLabel( m_xLabel ); @@ -122,7 +117,6 @@ uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -136,7 +130,6 @@ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XMo } void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -150,19 +143,16 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util:: } OUString SAL_CALL LabeledDataSequence::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.LabeledDataSequence"); } sal_Bool SAL_CALL LabeledDataSequence::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LabeledDataSequence::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.data.LabeledDataSequence" }; } diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 2dbb9ba7ece2..b04f0a82a548 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -110,7 +110,6 @@ void LifeTimeManager::impl_unregisterApiCall(bool bLongLastingCall) } bool LifeTimeManager::dispose() - throw(uno::RuntimeException) { //hold no mutex { @@ -190,7 +189,6 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert ) } bool CloseableLifeTimeManager::g_close_startTryClose(bool bDeliverOwnership) - throw ( uno::Exception ) { //no mutex is allowed to be acquired { @@ -263,7 +261,6 @@ void CloseableLifeTimeManager::g_close_endTryClose(bool bDeliverOwnership, bool } bool CloseableLifeTimeManager::g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, util::CloseVetoException& ex ) - throw ( util::CloseVetoException ) { //this method is called when no closelistener has had a veto during queryclosing //the method returns false, if nothing stands against closing anymore @@ -369,7 +366,6 @@ void CloseableLifeTimeManager::impl_doClose() } void CloseableLifeTimeManager::g_addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) - throw(uno::RuntimeException) { osl::Guard< osl::Mutex > aGuard( m_aAccessMutex ); //Mutex needs to be acquired exactly ones; will be released inbetween diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index 05f6aefe66a1..7c6e5240d14e 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -41,7 +41,6 @@ void LinearRegressionCurveCalculator::setRegressionProperties( sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod ) - throw (uno::RuntimeException, std::exception) { PolynomialRegressionCurveCalculator::setRegressionProperties( 1, @@ -55,8 +54,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LinearRegressionCurveCalculator: const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLinearScaling( xScalingX ) && diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index c50a8c361b24..a69d68ea4137 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -45,7 +45,6 @@ LogarithmicRegressionCurveCalculator::~LogarithmicRegressionCurveCalculator() void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -90,8 +89,6 @@ void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression( } double SAL_CALL LogarithmicRegressionCurveCalculator::getCurveValue( double x ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -110,8 +107,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LogarithmicRegressionCurveCalcul const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLogarithmicScaling( xScalingX ) && diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index 3835a46ccbef..592a2014e340 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -43,7 +43,6 @@ MeanValueRegressionCurveCalculator::~MeanValueRegressionCurveCalculator() void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& /*aXValues*/, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { const sal_Int32 nDataLength = aYValues.getLength(); sal_Int32 nMax = nDataLength; @@ -89,8 +88,6 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression( } double SAL_CALL MeanValueRegressionCurveCalculator::getCurveValue( double /*x*/ ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { return m_fMeanValue; } @@ -100,8 +97,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MeanValueRegressionCurveCalculat const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation ) { diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 7b4c26156e11..44fd89e248e8 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -157,27 +157,23 @@ void ModifyEventForwarder::DisposeAndClear( const Reference< uno::XWeak > & xSou // ____ XModifyBroadcaster ____ void SAL_CALL ModifyEventForwarder::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { AddListener( aListener ); } void SAL_CALL ModifyEventForwarder::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { RemoveListener( aListener ); } // ____ XModifyListener ____ void SAL_CALL ModifyEventForwarder::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { lcl_fireModifyEvent( m_aModifyListeners, Reference< uno::XWeak >(), &aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ModifyEventForwarder::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx index dac1616b7ab7..85406c9d62d4 100644 --- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx @@ -41,7 +41,6 @@ MovingAverageRegressionCurveCalculator::~MovingAverageRegressionCurveCalculator( void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { ::rtl::math::setNan( & m_fCorrelationCoeffitient ); @@ -73,8 +72,6 @@ void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression( } double SAL_CALL MovingAverageRegressionCurveCalculator::getCurveValue( double /*x*/ ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; rtl::math::setNan(&fResult); @@ -86,8 +83,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MovingAverageRegressionCurveCalc const uno::Reference< chart2::XScaling >& /*xScalingX*/, const uno::Reference< chart2::XScaling >& /*xScalingY*/, sal_Bool /*bMaySkipPointsInCalculation*/ ) - throw (lang::IllegalArgumentException, - 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 ab2d48ec636b..58e9296a678b 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -59,26 +59,22 @@ NameContainer::~NameContainer() //XServiceInfo OUString SAL_CALL NameContainer::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return m_aImplementationName; } sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { m_aServicename }; } // XNameContainer void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if( m_aMap.find( rName ) != m_aMap.end() ) throw container::ElementExistException(); @@ -86,7 +82,6 @@ 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, std::exception) { tContentMap::iterator aIt( m_aMap.find( Name )); if( aIt == m_aMap.end()) @@ -96,7 +91,6 @@ 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, std::exception ) { tContentMap::iterator aIt( m_aMap.find( rName )); if( aIt == m_aMap.end() ) @@ -106,7 +100,6 @@ 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, std::exception) { tContentMap::iterator aIter( m_aMap.find( rName ) ); if( aIter == m_aMap.end() ) @@ -115,7 +108,6 @@ Any SAL_CALL NameContainer::getByName( const OUString& rName ) } Sequence< OUString > SAL_CALL NameContainer::getElementNames() - throw( uno::RuntimeException, std::exception ) { sal_Int32 nCount = m_aMap.size(); Sequence< OUString > aSeq(nCount); @@ -126,27 +118,23 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames() } sal_Bool SAL_CALL NameContainer::hasByName( const OUString& rName ) - throw( uno::RuntimeException, std::exception ) { return ( m_aMap.find( rName ) != m_aMap.end() ); } // XElementAccess sal_Bool SAL_CALL NameContainer::hasElements() - throw( uno::RuntimeException, std::exception ) { return ! m_aMap.empty(); } uno::Type SAL_CALL NameContainer::getElementType() - throw( uno::RuntimeException, std::exception ) { return m_aType; } // XCloneable uno::Reference< util::XCloneable > SAL_CALL NameContainer::createClone() - 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 0dcf03c0da1a..30a08c1ad283 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -70,7 +70,6 @@ OPropertySet::~OPropertySet() {} Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException, std::exception) { return ::cppu::queryInterface( aType, @@ -86,7 +85,6 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType ) // ____ XTypeProvider ____ Sequence< uno::Type > SAL_CALL OPropertySet::getTypes() - throw (uno::RuntimeException, std::exception) { static const Sequence< uno::Type > aTypeList{ cppu::UnoType<lang::XTypeProvider>::get(), @@ -102,7 +100,6 @@ Sequence< uno::Type > SAL_CALL Sequence< sal_Int8 > SAL_CALL OPropertySet::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -110,8 +107,6 @@ Sequence< sal_Int8 > SAL_CALL // ____ XPropertyState ____ beans::PropertyState SAL_CALL OPropertySet::getPropertyState( const OUString& PropertyName ) - throw (beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -121,8 +116,6 @@ beans::PropertyState SAL_CALL Sequence< beans::PropertyState > SAL_CALL OPropertySet::getPropertyStates( const Sequence< OUString >& aPropertyName ) - throw (beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -137,8 +130,6 @@ Sequence< beans::PropertyState > SAL_CALL void SAL_CALL OPropertySet::setPropertyToDefault( const OUString& PropertyName ) - throw (beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -148,9 +139,6 @@ void SAL_CALL Any SAL_CALL OPropertySet::getPropertyDefault( const OUString& aPropertyName ) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -164,7 +152,6 @@ Any SAL_CALL void SAL_CALL OPropertySet::setAllPropertiesToDefault() - throw (uno::RuntimeException, std::exception) { m_pImplProperties->SetAllPropertiesToDefault(); firePropertyChangeEvent(); @@ -172,8 +159,6 @@ void SAL_CALL void SAL_CALL OPropertySet::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames ) - throw (beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -188,9 +173,6 @@ void SAL_CALL Sequence< Any > SAL_CALL OPropertySet::getPropertyDefaults( const Sequence< OUString >& aPropertyNames ) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { ::cppu::IPropertyArrayHelper & rPH = getInfoHelper(); const sal_Int32 nElements = aPropertyNames.getLength(); @@ -213,7 +195,6 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (lang::IllegalArgumentException) { getFastPropertyValue( rOldValue, nHandle ); //accept longs also for short values @@ -245,7 +226,6 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const Any& rValue ) - throw (uno::Exception, std::exception) { #if OSL_DEBUG_LEVEL > 0 if( rValue.hasValue()) @@ -359,14 +339,11 @@ void OPropertySet::firePropertyChangeEvent() // ____ XStyleSupplier ____ Reference< style::XStyle > SAL_CALL OPropertySet::getStyle() - throw (uno::RuntimeException, std::exception) { return m_pImplProperties->GetStyle(); } void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( ! m_pImplProperties->SetStyle( xStyle )) throw lang::IllegalArgumentException( @@ -378,10 +355,6 @@ void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle ) // ____ XMultiPropertySet ____ void SAL_CALL OPropertySet::setPropertyValues( const Sequence< OUString >& PropertyNames, const Sequence< Any >& Values ) - throw(beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { ::cppu::OPropertySetHelper::setPropertyValues( PropertyNames, Values ); @@ -390,10 +363,6 @@ void SAL_CALL OPropertySet::setPropertyValues( // ____ XFastPropertySet ____ void SAL_CALL OPropertySet::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) - throw(beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - 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 ef3ba7eb3014..2846dbecba09 100644 --- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx @@ -42,7 +42,6 @@ PolynomialRegressionCurveCalculator::~PolynomialRegressionCurveCalculator() void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { rtl::math::setNan(&m_fCorrelationCoeffitient); @@ -199,8 +198,6 @@ void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression( } double SAL_CALL PolynomialRegressionCurveCalculator::getCurveValue( double x ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; rtl::math::setNan(&fResult); diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index 512b3736cfaa..90a542af26d9 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -46,7 +46,6 @@ PotentialRegressionCurveCalculator::~PotentialRegressionCurveCalculator() void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -102,8 +101,6 @@ void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression( } double SAL_CALL PotentialRegressionCurveCalculator::getCurveValue( double x ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -122,8 +119,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL PotentialRegressionCurveCalculat const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLogarithmicScaling( xScalingX ) && diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 6bc788ec8b9e..13c107a6d2b2 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -75,7 +75,6 @@ RangeHighlighter::~RangeHighlighter() // ____ XRangeHighlighter ____ Sequence< chart2::data::HighlightedRange > SAL_CALL RangeHighlighter::getSelectedRanges() - throw (uno::RuntimeException, std::exception) { return m_aSelectedRanges; } @@ -299,7 +298,6 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface } void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if(!xListener.is()) return; @@ -315,7 +313,6 @@ void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< vie } void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener ); --m_nAddedListenerCount; @@ -325,7 +322,6 @@ void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< // ____ XSelectionChangeListener ____ void SAL_CALL RangeHighlighter::selectionChanged( const lang::EventObject& /*aEvent*/ ) - throw (uno::RuntimeException, std::exception) { determineRanges(); @@ -352,7 +348,6 @@ void RangeHighlighter::fireSelectionEvent() } void SAL_CALL RangeHighlighter::disposing( const lang::EventObject& Source ) - 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 429eeb002121..5174b3d79ffc 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -77,7 +77,6 @@ void RegressionCurveCalculator::setRegressionProperties( sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod ) - throw (uno::RuntimeException, std::exception) { mDegree = aDegree; mForceIntercept = aForceIntercept; @@ -136,7 +135,6 @@ 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, std::exception) { if( nPointCount < 2 ) throw lang::IllegalArgumentException(); @@ -172,13 +170,11 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa } double SAL_CALL RegressionCurveCalculator::getCorrelationCoefficient() - throw (uno::RuntimeException, std::exception) { return m_fCorrelationCoeffitient; } OUString SAL_CALL RegressionCurveCalculator::getRepresentation() - throw (uno::RuntimeException, std::exception) { return ImplGetRepresentation( Reference< util::XNumberFormatter >(), 0 ); } @@ -186,7 +182,6 @@ OUString SAL_CALL RegressionCurveCalculator::getRepresentation() OUString SAL_CALL RegressionCurveCalculator::getFormattedRepresentation( const Reference< util::XNumberFormatsSupplier > & xNumFmtSupplier, sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength ) -throw (uno::RuntimeException, std::exception) { // create and prepare a number formatter if( !xNumFmtSupplier.is()) @@ -213,7 +208,6 @@ void RegressionCurveCalculator::addStringToEquation( } void SAL_CALL RegressionCurveCalculator::setXYNames( const OUString& aXName, const OUString& aYName ) - throw (uno::RuntimeException, std::exception) { if ( aXName.isEmpty() ) mXName = OUString ("x"); diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index bce0d5064e1f..bbfa82b2e689 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -206,19 +206,16 @@ RegressionCurveModel::~RegressionCurveModel() // ____ XRegressionCurve ____ uno::Reference< chart2::XRegressionCurveCalculator > SAL_CALL RegressionCurveModel::getCalculator() - throw (uno::RuntimeException, std::exception) { return RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( getServiceName()); } uno::Reference< beans::XPropertySet > SAL_CALL RegressionCurveModel::getEquationProperties() - throw (uno::RuntimeException, std::exception) { return m_xEquationProperties; } void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< beans::XPropertySet >& xEquationProperties ) - throw (uno::RuntimeException, std::exception) { if( xEquationProperties.is()) { @@ -233,7 +230,6 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< // ____ XServiceName ____ OUString SAL_CALL RegressionCurveModel::getServiceName() - throw (uno::RuntimeException, std::exception) { switch( m_eRegressionCurveType ) { @@ -258,7 +254,6 @@ OUString SAL_CALL RegressionCurveModel::getServiceName() // ____ XModifyBroadcaster ____ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -272,7 +267,6 @@ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< uti } void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -287,14 +281,12 @@ void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< // ____ XModifyListener ____ void SAL_CALL RegressionCurveModel::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } @@ -312,7 +304,6 @@ void RegressionCurveModel::fireModifyEvent() // ____ OPropertySet ____ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticXXXDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -328,7 +319,6 @@ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL RegressionCurveModel::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticRegressionCurveInfo::get(); } @@ -352,25 +342,21 @@ MeanValueRegressionCurve::~MeanValueRegressionCurve() {} OUString SAL_CALL MeanValueRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_MeanValue; } sal_Bool SAL_CALL MeanValueRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL MeanValueRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.MeanValueRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new MeanValueRegressionCurve( *this )); } @@ -386,25 +372,21 @@ LinearRegressionCurve::~LinearRegressionCurve() {} OUString SAL_CALL LinearRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Linear; } sal_Bool SAL_CALL LinearRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LinearRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.LinearRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LinearRegressionCurve( *this )); } @@ -420,25 +402,21 @@ LogarithmicRegressionCurve::~LogarithmicRegressionCurve() {} OUString SAL_CALL LogarithmicRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Logarithmic; } sal_Bool SAL_CALL LogarithmicRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LogarithmicRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.LogarithmicRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LogarithmicRegressionCurve( *this )); } @@ -454,25 +432,21 @@ ExponentialRegressionCurve::~ExponentialRegressionCurve() {} OUString SAL_CALL ExponentialRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Exponential; } sal_Bool SAL_CALL ExponentialRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ExponentialRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.ExponentialRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ExponentialRegressionCurve( *this )); } @@ -488,25 +462,21 @@ PotentialRegressionCurve::~PotentialRegressionCurve() {} OUString SAL_CALL PotentialRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Potential; } sal_Bool SAL_CALL PotentialRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PotentialRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.PotentialRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PotentialRegressionCurve( *this )); } @@ -522,25 +492,21 @@ PolynomialRegressionCurve::~PolynomialRegressionCurve() {} OUString SAL_CALL PolynomialRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Polynomial; } sal_Bool SAL_CALL PolynomialRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PolynomialRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.PolynomialRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL PolynomialRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PolynomialRegressionCurve( *this )); } @@ -556,25 +522,21 @@ MovingAverageRegressionCurve::~MovingAverageRegressionCurve() {} OUString SAL_CALL MovingAverageRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_MovingAverage; } sal_Bool SAL_CALL MovingAverageRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL MovingAverageRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.MovingAverageRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::createClone() - 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 4e7191a04177..3f9b6cbb46f5 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -76,47 +76,37 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XRegressionCurve ____ - virtual css::uno::Reference< css::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEquationProperties() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEquationProperties() override; virtual void SAL_CALL setEquationProperties( - const css::uno::Reference< css::beans::XPropertySet >& xEquationProperties ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& xEquationProperties ) override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; using ::cppu::OPropertySetHelper::disposing; @@ -143,16 +133,12 @@ public: virtual ~MeanValueRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class LinearRegressionCurve : public RegressionCurveModel @@ -163,16 +149,12 @@ public: virtual ~LinearRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class LogarithmicRegressionCurve : public RegressionCurveModel @@ -183,16 +165,12 @@ public: virtual ~LogarithmicRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class ExponentialRegressionCurve : public RegressionCurveModel @@ -203,16 +181,12 @@ public: virtual ~ExponentialRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class PotentialRegressionCurve : public RegressionCurveModel @@ -223,16 +197,12 @@ public: virtual ~PotentialRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class PolynomialRegressionCurve : public RegressionCurveModel @@ -243,16 +213,12 @@ public: virtual ~PolynomialRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class MovingAverageRegressionCurve : public RegressionCurveModel @@ -263,16 +229,12 @@ public: virtual ~MovingAverageRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; } // namespace chart diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index ce759a3fb68f..ab13afc027a1 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -212,14 +212,12 @@ RegressionEquation::~RegressionEquation() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL RegressionEquation::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new RegressionEquation( *this )); } // ____ OPropertySet ____ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { const tPropertyValueMap& rStaticDefaults = *StaticRegressionEquationDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -235,14 +233,12 @@ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL RegressionEquation::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticRegressionEquationInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -256,7 +252,6 @@ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util: } void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -271,14 +266,12 @@ void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< ut // ____ XModifyListener ____ void SAL_CALL RegressionEquation::modified( const lang::EventObject& aEvent ) - 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, std::exception) { // nothing } @@ -296,14 +289,12 @@ void RegressionEquation::fireModifyEvent() // ____ XTitle ____ uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL RegressionEquation::getText() - 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, std::exception) { MutexGuard aGuard( GetMutex() ); ModifyListenerHelper::removeListenerFromAllElements( @@ -315,19 +306,16 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< } OUString SAL_CALL RegressionEquation::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.RegressionEquation"); } sal_Bool SAL_CALL RegressionEquation::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL RegressionEquation::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.RegressionEquation", "com.sun.star.beans.PropertySet", diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index 6dcdd605f2d8..e018061f8f33 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -58,15 +58,12 @@ public: virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; /// merge XInterface implementations @@ -76,47 +73,37 @@ protected: explicit RegressionEquation( const RegressionEquation & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ XTitle ____ virtual css::uno::Sequence< - css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() override; virtual void SAL_CALL setText( const css::uno::Sequence< css::uno::Reference< - css::chart2::XFormattedString > >& Strings ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart2::XFormattedString > >& Strings ) override; using ::cppu::OPropertySetHelper::disposing; diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 83084b9126ae..9edd475afdcb 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -54,7 +54,6 @@ LogarithmicScaling::~LogarithmicScaling() } double SAL_CALL LogarithmicScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -65,31 +64,26 @@ double SAL_CALL LogarithmicScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL LogarithmicScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { return new ExponentialScaling( m_fBase ); } OUString SAL_CALL LogarithmicScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_Logarithmic); } OUString SAL_CALL LogarithmicScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_Logarithmic); } sal_Bool SAL_CALL LogarithmicScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LogarithmicScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_Logarithmic }; } @@ -109,7 +103,6 @@ ExponentialScaling::~ExponentialScaling() } double SAL_CALL ExponentialScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -120,31 +113,26 @@ double SAL_CALL ExponentialScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL ExponentialScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { return new LogarithmicScaling( m_fBase ); } OUString SAL_CALL ExponentialScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_Exponential); } OUString SAL_CALL ExponentialScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_Exponential); } sal_Bool SAL_CALL ExponentialScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ExponentialScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_Exponential }; } @@ -163,7 +151,6 @@ LinearScaling::~LinearScaling() {} double SAL_CALL LinearScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -175,7 +162,6 @@ double SAL_CALL LinearScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL LinearScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { // ToDo: ApproxEqual ? if( m_fSlope == 0 ) @@ -185,25 +171,21 @@ uno::Reference< XScaling > SAL_CALL } OUString SAL_CALL LinearScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_Linear); } OUString SAL_CALL LinearScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_Linear) ; } sal_Bool SAL_CALL LinearScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LinearScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_Linear }; } @@ -220,7 +202,6 @@ PowerScaling::~PowerScaling() {} double SAL_CALL PowerScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -232,7 +213,6 @@ double SAL_CALL PowerScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL PowerScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { // ToDo: ApproxEqual ? if( m_fExponent == 0 ) @@ -243,25 +223,21 @@ uno::Reference< XScaling > SAL_CALL OUString SAL_CALL PowerScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_Power); } OUString SAL_CALL PowerScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_Power); } sal_Bool SAL_CALL PowerScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PowerScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_Power }; } diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 67a99d72c361..c4d7290d6fee 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -125,7 +125,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UncachedDataSequence, UncachedDataSequence_Bas // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } @@ -147,19 +146,16 @@ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertyS } OUString SAL_CALL UncachedDataSequence::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName); } sal_Bool SAL_CALL UncachedDataSequence::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, @@ -171,7 +167,6 @@ css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServic // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() - throw (uno::RuntimeException, std::exception) { Sequence< double > aResult; MutexGuard aGuard( GetMutex() ); @@ -187,7 +182,6 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() // ________ XTextualDataSequence ________ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() - throw (uno::RuntimeException, std::exception) { Sequence< OUString > aResult; MutexGuard aGuard( GetMutex() ); @@ -203,7 +197,6 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() // ________ XDataSequence ________ Sequence< Any > SAL_CALL UncachedDataSequence::getData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); if( m_xDataProvider.is()) @@ -212,31 +205,23 @@ Sequence< Any > SAL_CALL UncachedDataSequence::getData() } OUString SAL_CALL UncachedDataSequence::getSourceRangeRepresentation() - throw (uno::RuntimeException, std::exception) { return getName(); } Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data::LabelOrigin ) - throw (uno::RuntimeException, std::exception) { // auto-generated label is an empty string return Sequence< OUString >(1); } ::sal_Int32 SAL_CALL UncachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { return m_nNumberFormatKey; } // ____ XIndexReplace ____ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) - throw (lang::IllegalArgumentException, - lang::IndexOutOfBoundsException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); Sequence< Any > aData( getData()); @@ -251,16 +236,12 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno // ____ XIndexAccess (base of XIndexReplace) ____ ::sal_Int32 SAL_CALL UncachedDataSequence::getCount() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Implement!" ); return 0; } uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 ) - throw (lang::IndexOutOfBoundsException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL( "Implement!" ); return uno::Any(); @@ -268,13 +249,11 @@ uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 ) // ____ XElementAccess (base of XIndexAccess) ____ uno::Type SAL_CALL UncachedDataSequence::getElementType() - throw (uno::RuntimeException, std::exception) { return cppu::UnoType<uno::Any>::get(); } sal_Bool SAL_CALL UncachedDataSequence::hasElements() - throw (uno::RuntimeException, std::exception) { if( ! m_xDataProvider.is()) return false; @@ -283,20 +262,17 @@ sal_Bool SAL_CALL UncachedDataSequence::hasElements() // ____ XNamed ____ OUString SAL_CALL UncachedDataSequence::getName() - throw (uno::RuntimeException, std::exception) { return m_aSourceRepresentation; } void SAL_CALL UncachedDataSequence::setName( const OUString& aName ) - throw (uno::RuntimeException, std::exception) { m_aSourceRepresentation = aName; fireModifyEvent(); } Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone() - throw (uno::RuntimeException, std::exception) { UncachedDataSequence * pNewSeq = new UncachedDataSequence( *this ); return Reference< util::XCloneable >( pNewSeq ); @@ -304,14 +280,11 @@ Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone() // ____ XModifiable ____ sal_Bool SAL_CALL UncachedDataSequence::isModified() - throw (uno::RuntimeException, std::exception) { return false; } void SAL_CALL UncachedDataSequence::setModified( sal_Bool bModified ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { if( bModified ) fireModifyEvent(); @@ -319,7 +292,6 @@ 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, std::exception) { try { @@ -333,7 +305,6 @@ void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XM } void SAL_CALL UncachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx index 6a1b014a418d..12c616f2f72f 100644 --- a/chart2/source/tools/WeakListenerAdapter.cxx +++ b/chart2/source/tools/WeakListenerAdapter.cxx @@ -35,7 +35,6 @@ WeakModifyListenerAdapter::~WeakModifyListenerAdapter() {} void SAL_CALL WeakModifyListenerAdapter::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModListener( getListener() ); if( xModListener.is()) @@ -51,7 +50,6 @@ WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter() {} void SAL_CALL WeakSelectionChangeListenerAdapter::selectionChanged( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { Reference< view::XSelectionChangeListener > xSelChgListener( getListener() ); if( xSelChgListener.is()) diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx index b9ef06dcf4a1..ef74d61e9dee 100644 --- a/chart2/source/tools/WrappedDefaultProperty.cxx +++ b/chart2/source/tools/WrappedDefaultProperty.cxx @@ -39,8 +39,6 @@ WrappedDefaultProperty::~WrappedDefaultProperty() void WrappedDefaultProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, - uno::RuntimeException) { Reference< beans::XPropertySet > xInnerPropSet( xInnerPropertyState, uno::UNO_QUERY ); if( xInnerPropSet.is()) @@ -49,17 +47,12 @@ void WrappedDefaultProperty::setPropertyToDefault( uno::Any WrappedDefaultProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException) { return m_aOuterDefaultValue; } beans::PropertyState WrappedDefaultProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, - uno::RuntimeException) { beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE; try diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx index ceef3bfc79cf..34941778926f 100644 --- a/chart2/source/tools/WrappedDirectStateProperty.cxx +++ b/chart2/source/tools/WrappedDirectStateProperty.cxx @@ -37,8 +37,6 @@ WrappedDirectStateProperty::~WrappedDirectStateProperty() beans::PropertyState WrappedDirectStateProperty::getPropertyState( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (beans::UnknownPropertyException, - uno::RuntimeException) { return beans::PropertyState_DIRECT_VALUE; } diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index 6ac89266bd20..5a0cdef9a61c 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -46,31 +46,26 @@ WrappedIgnoreProperty::~WrappedIgnoreProperty() } void WrappedIgnoreProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { m_aCurrentValue = rOuterValue; } Any WrappedIgnoreProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return m_aCurrentValue; } void WrappedIgnoreProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { m_aCurrentValue = m_aDefaultValue; } Any WrappedIgnoreProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return m_aDefaultValue; } beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { return ( m_aCurrentValue == m_aDefaultValue ? beans::PropertyState_DEFAULT_VALUE diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index c664a6ae92ea..0b7c93c70dc6 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -52,14 +52,12 @@ Any WrappedProperty::convertOuterToInnerValue( const Any& rOuterValue ) const } void WrappedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if(xInnerPropertySet.is()) xInnerPropertySet->setPropertyValue( this->getInnerName(), this->convertOuterToInnerValue( rOuterValue ) ); } Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertySet.is() ) @@ -71,7 +69,6 @@ Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& x } void WrappedProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( xInnerPropertyState.is() && !this->getInnerName().isEmpty() ) xInnerPropertyState->setPropertyToDefault(this->getInnerName()); @@ -83,7 +80,6 @@ void WrappedProperty::setPropertyToDefault( const Reference< beans::XPropertySta } Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertyState.is() ) @@ -95,7 +91,6 @@ Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState } beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE; OUString aInnerName( this->getInnerName() ); diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index e7783e201a73..78c86c73852a 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -70,7 +70,6 @@ void WrappedPropertySet::clearWrappedPropertySet() //XPropertySet Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySetInfo( ) - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySetInfo > xInfo = m_xInfo; if( !xInfo.is() ) @@ -92,7 +91,6 @@ 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, std::exception) { try { @@ -137,7 +135,6 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam } } Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -179,7 +176,6 @@ 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, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -192,7 +188,6 @@ 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, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -205,7 +200,6 @@ 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, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -218,7 +212,6 @@ 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, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -233,7 +226,6 @@ 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, std::exception) { bool bUnknownProperty = false; sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); @@ -257,7 +249,6 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& // throw beans::UnknownPropertyException(); } Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< OUString >& rNameSeq ) - throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -283,19 +274,16 @@ 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, std::exception) { OSL_FAIL("not implemented yet"); //todo } void SAL_CALL WrappedPropertySet::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - 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, std::exception) { OSL_FAIL("not implemented yet"); //todo @@ -303,7 +291,6 @@ void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUS //XPropertyState beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); @@ -334,7 +321,6 @@ const WrappedProperty* WrappedPropertySet::getWrappedProperty( sal_Int32 nHandle } Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( const Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -350,7 +336,6 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( } void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); if( xInnerPropertyState.is() ) @@ -363,7 +348,6 @@ void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropert } } Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); @@ -380,7 +364,6 @@ Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyNa //XMultiPropertyStates void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( ) - throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = getPropertySequence(); for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++) @@ -390,7 +373,6 @@ void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( ) } } void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { @@ -399,7 +381,6 @@ 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, 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 2dd8e3427835..0a83e792b818 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -52,7 +52,6 @@ DateScaling::~DateScaling() } double SAL_CALL DateScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult(value); if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -93,31 +92,26 @@ double SAL_CALL DateScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL DateScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { return new InverseDateScaling( m_aNullDate, m_nTimeUnit, m_bShifted ); } OUString SAL_CALL DateScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_DateScaling); } OUString SAL_CALL DateScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_DateScaling); } sal_Bool SAL_CALL DateScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DateScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_DateScaling }; } @@ -134,7 +128,6 @@ InverseDateScaling::~InverseDateScaling() } double SAL_CALL InverseDateScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult(value); if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -182,31 +175,26 @@ double SAL_CALL InverseDateScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL InverseDateScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { return new DateScaling( m_aNullDate, m_nTimeUnit, m_bShifted ); } OUString SAL_CALL InverseDateScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_InverseDateScaling); } OUString SAL_CALL InverseDateScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_InverseDateScaling); } sal_Bool SAL_CALL InverseDateScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL InverseDateScaling::getSupportedServiceNames() - throw( css::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 3ee7f22a8568..acbb5409e9ef 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -41,24 +41,19 @@ public: virtual ~DateScaling() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XScaling ____ - virtual double SAL_CALL doScaling( double value ) - throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL doScaling( double value ) override; virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL - getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; + getInverseScaling() override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; private: const Date m_aNullDate; @@ -78,23 +73,18 @@ public: virtual ~InverseDateScaling() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XScaling ____ - virtual double SAL_CALL doScaling( double value ) - throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL doScaling( double value ) override; virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL - getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; + getInverseScaling() override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; private: const Date m_aNullDate; diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index e88785840de4..886b67e9edc2 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -144,7 +144,6 @@ bool VAxisBase::isAnythingToDraw() void VAxisBase::setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (uno::RuntimeException) { m_bReCreateAllTickInfos = true; m_aScale = rScale; diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index 3599972e12b1..3f8f71cd8995 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -55,8 +55,7 @@ public: virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale - , const ExplicitIncrementData& rIncrement ) - throw (css::uno::RuntimeException) override; + , const ExplicitIncrementData& rIncrement ) override; virtual sal_Int32 estimateMaximumAutoMainIncrementCount(); virtual void createAllTickInfos( TickInfoArraysType& rAllTickInfos ); diff --git a/chart2/source/view/axes/VAxisOrGridBase.cxx b/chart2/source/view/axes/VAxisOrGridBase.cxx index be5eec08d880..52ddc16fdbcf 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.cxx +++ b/chart2/source/view/axes/VAxisOrGridBase.cxx @@ -43,7 +43,6 @@ VAxisOrGridBase::~VAxisOrGridBase() void VAxisOrGridBase::setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (uno::RuntimeException) { m_aScale = rScale; m_aIncrement = rIncrement; diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx index be81876a06de..44cd5e772a4f 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.hxx +++ b/chart2/source/view/axes/VAxisOrGridBase.hxx @@ -43,8 +43,7 @@ public: /// @throws css::uno::RuntimeException virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale - , const ExplicitIncrementData& rIncrement ) - throw (css::uno::RuntimeException); + , const ExplicitIncrementData& rIncrement ); void set3DWallPositions( CuboidPlanePosition eLeftWallPos, CuboidPlanePosition eBackWallPos, CuboidPlanePosition eBottomPos ); virtual TickFactory* createTickFactory(); diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 5aceed61248b..934d17046ea3 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -43,8 +43,7 @@ public: } //XTextualDataSequence - virtual uno::Sequence< OUString > SAL_CALL getTextualData() - throw ( uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getTextualData() override { return m_aTextSequence; } diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 7cff69374e75..d9440207c956 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -99,7 +99,6 @@ void VCoordinateSystem::initPlottingTargets( const Reference< drawing::XShapes , const Reference< drawing::XShapes >& xFinalTarget , const Reference< lang::XMultiServiceFactory >& xShapeFactory , Reference< drawing::XShapes >& xLogicTargetForSeriesBehindAxis ) - throw (uno::RuntimeException, std::exception) { OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters"); //is only allowed to be called once diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index a3b1b50c4123..5ebb65809dab 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -61,7 +61,6 @@ void VPolarRadiusAxis::setTransformationSceneToScreen( const drawing::HomogenMat void VPolarRadiusAxis::setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (uno::RuntimeException) { VPolarAxis::setExplicitScaleAndIncrement( rScale, rIncrement ); m_apAxisWithLabels->setExplicitScaleAndIncrement( rScale, rIncrement ); @@ -71,7 +70,6 @@ void VPolarRadiusAxis::initPlotter( const uno::Reference< drawing::XShapes >& x , const uno::Reference< drawing::XShapes >& xFinalTarget , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory , const OUString& rCID ) - throw (uno::RuntimeException) { VPolarAxis::initPlotter( xLogicTarget, xFinalTarget, xShapeFactory, rCID ); m_apAxisWithLabels->initPlotter( xLogicTarget, xFinalTarget, xShapeFactory, rCID ); diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index b43c2b256cc3..e4f2d85da738 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -43,7 +43,7 @@ public: , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const OUString& rCID - ) throw (css::uno::RuntimeException ) override; + ) override; virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ) override; @@ -51,8 +51,7 @@ public: virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale - , const ExplicitIncrementData& rIncrement ) - throw (css::uno::RuntimeException) override; + , const ExplicitIncrementData& rIncrement ) override; virtual void initAxisLabelProperties( const css::awt::Size& rFontReferenceSize diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 9336ea3a9732..fdfc059c11d9 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -2023,7 +2023,6 @@ double VSeriesPlotter::getTransformedDepth() const } void VSeriesPlotter::addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) - throw (uno::RuntimeException) { if( nAxisIndex<1 ) return; diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx index 396d1e57379f..3572caab7a7c 100644 --- a/chart2/source/view/inc/Linear3DTransformation.hxx +++ b/chart2/source/view/inc/Linear3DTransformation.hxx @@ -37,15 +37,11 @@ public: // ____ XTransformation ____ /// @see css::chart2::XTransformation virtual css::uno::Sequence< double > SAL_CALL transform( - const css::uno::Sequence< double >& rSourceValues ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< double >& rSourceValues ) override; /// @see css::chart2::XTransformation - virtual sal_Int32 SAL_CALL getSourceDimension() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSourceDimension() override; /// @see css::chart2::XTransformation - virtual sal_Int32 SAL_CALL getTargetDimension() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTargetDimension() override; private: css::drawing::HomogenMatrix m_Matrix; diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index 1d12d8633e56..8c408328f419 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -54,7 +54,7 @@ public: , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const OUString& rCID - ) throw (css::uno::RuntimeException, std::exception); + ); virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index aac86229d1b9..97ceebd16050 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -55,8 +55,7 @@ public: const css::uno::Reference< css::drawing::XShapes >& xLogicTarget , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory - , css::uno::Reference< css::drawing::XShapes >& xLogicTargetForSeriesBehindAxis ) - throw (css::uno::RuntimeException, std::exception); + , css::uno::Reference< css::drawing::XShapes >& xLogicTargetForSeriesBehindAxis ); void setParticle( const OUString& rCooSysParticle ); diff --git a/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx index a9b548e70d1e..af9404ffc1d5 100644 --- a/chart2/source/view/inc/VPolarTransformation.hxx +++ b/chart2/source/view/inc/VPolarTransformation.hxx @@ -37,15 +37,11 @@ public: // ____ XTransformation ____ /// @see css::chart2::XTransformation virtual css::uno::Sequence< double > SAL_CALL transform( - const css::uno::Sequence< double >& rSourceValues ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< double >& rSourceValues ) override; /// @see css::chart2::XTransformation - virtual sal_Int32 SAL_CALL getSourceDimension() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSourceDimension() override; /// @see css::chart2::XTransformation - virtual sal_Int32 SAL_CALL getTargetDimension() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTargetDimension() override; private: PolarPlottingPositionHelper m_aPositionHelper; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 470de99d98cb..571d903843dd 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -156,8 +156,7 @@ public: @throws css::uno::RuntimeException */ - void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) - throw (css::uno::RuntimeException); + void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ); // MinimumAndMaximumSupplier diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 23023bdf26c4..c3ea04246c93 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1213,7 +1213,6 @@ void ChartView::init() } void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >& ) - throw ( uno::Exception, uno::RuntimeException, std::exception) { init(); } @@ -1315,7 +1314,6 @@ 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, std::exception) { bool bHighContrastMetaFile( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast)); uno::Any aRet; @@ -1349,7 +1347,6 @@ uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aF return aRet; } uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFlavors() - throw (uno::RuntimeException, std::exception) { uno::Sequence< datatransfer::DataFlavor > aRet(2); @@ -1363,7 +1360,6 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla return aRet; } sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) - throw (uno::RuntimeException, std::exception) { return ( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMEType) || aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast) ); @@ -1371,7 +1367,6 @@ sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlav // ____ XUnoTunnel ___ ::sal_Int64 SAL_CALL ChartView::getSomething( const uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw( uno::RuntimeException, std::exception) { if( aIdentifier.getLength() == 16 && 0 == memcmp( ExplicitValueProvider::getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) @@ -1385,19 +1380,16 @@ sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlav // lang::XServiceInfo OUString SAL_CALL ChartView::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_VIEW_SERVICE_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartView::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartView::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART_VIEW_SERVICE_NAME }; } @@ -2691,7 +2683,6 @@ void ChartView::render() // util::XEventListener (base of XCloseListener) void SAL_CALL ChartView::disposing( const lang::EventObject& /* rSource */ ) - throw(uno::RuntimeException, std::exception) { } @@ -2772,7 +2763,6 @@ void ChartView::impl_updateView( bool bCheckLockedCtrler ) // ____ XModifyListener ____ void SAL_CALL ChartView::modified( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException, std::exception) { m_bViewDirty = true; if( m_bInViewUpdate ) @@ -2870,30 +2860,26 @@ void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode ) // ____ XModeChangeBroadcaster ____ void SAL_CALL ChartView::addModeChangeListener( const uno::Reference< util::XModeChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aListenerContainer.addInterface( cppu::UnoType<util::XModeChangeListener>::get(), xListener ); } void SAL_CALL ChartView::removeModeChangeListener( const uno::Reference< util::XModeChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aListenerContainer.removeInterface( cppu::UnoType<util::XModeChangeListener>::get(), xListener ); } void SAL_CALL ChartView::addModeChangeApproveListener( const uno::Reference< util::XModeChangeApproveListener >& /* _rxListener */ ) - throw (lang::NoSupportException, uno::RuntimeException, std::exception) { } void SAL_CALL ChartView::removeModeChangeApproveListener( const uno::Reference< util::XModeChangeApproveListener >& /* _rxListener */ ) - throw (lang::NoSupportException, uno::RuntimeException, std::exception) { } // ____ XUpdatable ____ -void SAL_CALL ChartView::update() throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartView::update() { impl_updateView(); @@ -2906,19 +2892,18 @@ void SAL_CALL ChartView::update() throw (uno::RuntimeException, std::exception) impl_updateView(); } -void SAL_CALL ChartView::updateSoft() throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartView::updateSoft() { update(); } -void SAL_CALL ChartView::updateHard() throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartView::updateHard() { impl_updateView(false); } // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); return nullptr; @@ -2926,8 +2911,6 @@ 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, std::exception) { if( rPropertyName == "Resolution" ) { @@ -2980,7 +2963,6 @@ void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName } Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; if( rPropertyName == "Resolution" ) @@ -2994,25 +2976,21 @@ 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, 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, 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, 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, std::exception) { OSL_FAIL("not implemented"); } @@ -3020,7 +2998,6 @@ void SAL_CALL ChartView::removeVetoableChangeListener( const OUString& /* Proper // ____ XMultiServiceFactory ____ Reference< uno::XInterface > ChartView::createInstance( const OUString& aServiceSpecifier ) - throw (uno::Exception, uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3081,14 +3058,13 @@ 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, 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, std::exception) +uno::Sequence< OUString > ChartView::getAvailableServiceNames() { uno::Sequence< OUString > aServiceNames( 6 ); @@ -3102,7 +3078,7 @@ uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::Runt return aServiceNames; } -OUString ChartView::dump() throw (uno::RuntimeException, std::exception) +OUString ChartView::dump() { #if HAVE_FEATURE_DESKTOP // Used for unit tests and in chartcontroller only, no need to drag in this when cross-compiling diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 579765ab18da..115654d66bd7 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -84,27 +84,22 @@ public: explicit DummyPropertySetInfo(const std::map<OUString, uno::Any>& rProps ): mrProperties(rProps) {} - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& rName ) override; - virtual beans::Property SAL_CALL getPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception) override; + virtual beans::Property SAL_CALL getPropertyByName( const OUString& rName ) override; - virtual uno::Sequence< beans::Property > SAL_CALL getProperties() - throw(uno::RuntimeException, std::exception) override; + virtual uno::Sequence< beans::Property > SAL_CALL getProperties() override; private: const std::map<OUString, uno::Any>& mrProperties; }; sal_Bool SAL_CALL DummyPropertySetInfo::hasPropertyByName( const OUString& rName ) - 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, std::exception) { beans::Property aRet; if(mrProperties.find(rName) == mrProperties.end()) @@ -118,7 +113,6 @@ beans::Property SAL_CALL DummyPropertySetInfo::getPropertyByName( const OUString } uno::Sequence< beans::Property > SAL_CALL DummyPropertySetInfo::getProperties() - throw(uno::RuntimeException, std::exception) { uno::Sequence< beans::Property > aRet(mrProperties.size()); @@ -163,57 +157,46 @@ DummyXShape::DummyXShape() } OUString SAL_CALL DummyXShape::getName() - throw(uno::RuntimeException, std::exception) { return maName; } void SAL_CALL DummyXShape::setName( const OUString& rName ) - throw(uno::RuntimeException, std::exception) { maName = rName; } awt::Point SAL_CALL DummyXShape::getPosition() - throw(uno::RuntimeException, std::exception) { return maPosition; } void SAL_CALL DummyXShape::setPosition( const awt::Point& rPoint ) - throw(uno::RuntimeException, std::exception) { maPosition = rPoint; } awt::Size SAL_CALL DummyXShape::getSize() - throw(uno::RuntimeException, std::exception) { return maSize; } void SAL_CALL DummyXShape::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { maSize = rSize; } OUString SAL_CALL DummyXShape::getShapeType() - throw(uno::RuntimeException, std::exception) { return OUString("dummy shape"); } uno::Reference< beans::XPropertySetInfo > SAL_CALL DummyXShape::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { return new DummyPropertySetInfo(maProperties); } void SAL_CALL DummyXShape::setPropertyValue( const OUString& rName, const uno::Any& rValue) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SAL_INFO("chart2", "DummyXShape::setProperty: " << rName << " Any"); maProperties[rName] = rValue; @@ -224,7 +207,6 @@ 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, std::exception) { SAL_INFO("chart2.opengl", "DummyXShape::getPropertyValue: " << rName); std::map<OUString, uno::Any>::iterator itr = maProperties.find(rName); @@ -235,29 +217,23 @@ 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, std::exception) { } void SAL_CALL DummyXShape::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) - 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, std::exception) { } void SAL_CALL DummyXShape::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - 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, std::exception) { size_t n = std::min<size_t>(rNames.getLength(), rValues.getLength()); for(size_t i = 0; i < n; ++i) @@ -268,7 +244,6 @@ throw (beans::PropertyVetoException, lang::IllegalArgumentException, uno::Sequence< uno::Any > SAL_CALL DummyXShape::getPropertyValues( const uno::Sequence< OUString >& rNames) - throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Any > aValues(rNames.getLength()); for(sal_Int32 i = 0; i < rNames.getLength(); ++i) @@ -282,22 +257,20 @@ 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, std::exception) +void SAL_CALL DummyXShape::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) { } -void SAL_CALL DummyXShape::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DummyXShape::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) { } void SAL_CALL DummyXShape::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) - throw (uno::RuntimeException, std::exception) { } OUString SAL_CALL DummyXShape::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("DummyXShape"); } @@ -316,25 +289,21 @@ uno::Sequence< OUString > const & listSupportedServices() } uno::Sequence< OUString > SAL_CALL DummyXShape::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return listSupportedServices(); } sal_Bool SAL_CALL DummyXShape::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Reference< uno::XInterface > SAL_CALL DummyXShape::getParent() - throw(uno::RuntimeException, std::exception) { return mxParent; } void SAL_CALL DummyXShape::setParent( const uno::Reference< uno::XInterface >& xParent ) - throw(lang::NoSupportException, uno::RuntimeException, std::exception) { mxParent = xParent; } @@ -887,16 +856,12 @@ 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, std::exception) { SAL_INFO("chart2.opengl", "property value set after image has been created"); DummyXShape::setPropertyValue(rName, rValue); } void SAL_CALL DummyText::setPosition(const awt::Point& rPosition ) - throw(uno::RuntimeException, std::exception) { DummyXShape::setPosition(rPosition); if(maTrans.hasValue()) @@ -932,7 +897,6 @@ DummyGroup2D::DummyGroup2D(const OUString& rName) } awt::Point SAL_CALL DummyGroup2D::getPosition() - throw(uno::RuntimeException, std::exception) { long nTop = std::numeric_limits<long>::max(); long nLeft = std::numeric_limits<long>::max(); @@ -951,7 +915,6 @@ awt::Point SAL_CALL DummyGroup2D::getPosition() } awt::Size SAL_CALL DummyGroup2D::getSize() - throw(uno::RuntimeException, std::exception) { long nTop = std::numeric_limits<long>::max(); long nLeft = std::numeric_limits<long>::max(); @@ -972,7 +935,6 @@ awt::Size SAL_CALL DummyGroup2D::getSize() } void SAL_CALL DummyGroup2D::setPosition( const awt::Point& rPos ) - throw(uno::RuntimeException, std::exception) { for(std::vector<DummyXShape*>::const_iterator itr = maShapes.begin(), itrEnd = maShapes.end(); itr != itrEnd; ++itr) @@ -984,7 +946,6 @@ void SAL_CALL DummyGroup2D::setPosition( const awt::Point& rPos ) } void SAL_CALL DummyGroup2D::setSize( const awt::Size& ) - throw( beans::PropertyVetoException, uno::RuntimeException, std::exception ) { SAL_WARN("chart2.opengl", "set size on group shape"); } @@ -1008,7 +969,6 @@ DummyChart* DummyChart::getRootShape() } uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { if( rType == cppu::UnoType<drawing::XShapes>::get() ) return uno::makeAny(uno::Reference<drawing::XShapes>(this)); @@ -1018,7 +978,6 @@ uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType ) } uno::Any SAL_CALL DummyXShapes::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { if( rType == cppu::UnoType<drawing::XShapes>::get() ) return uno::makeAny(uno::Reference< drawing::XShapes >(this)); @@ -1039,7 +998,6 @@ void DummyXShapes::release() } void SAL_CALL DummyXShapes::add( const uno::Reference< drawing::XShape>& xShape ) - throw(uno::RuntimeException, std::exception) { DummyXShape& rChild = dynamic_cast<DummyXShape&>(*xShape.get()); maUNOShapes.push_back(xShape); @@ -1048,7 +1006,6 @@ 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, std::exception) { std::vector< uno::Reference<drawing::XShape> >::iterator itr = std::find(maUNOShapes.begin(), maUNOShapes.end(), xShape); if(itr != maUNOShapes.end()) @@ -1063,26 +1020,21 @@ void SAL_CALL DummyXShapes::remove( const uno::Reference< drawing::XShape>& xSha } uno::Type SAL_CALL DummyXShapes::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::XShape>::get(); } sal_Bool SAL_CALL DummyXShapes::hasElements() - throw(uno::RuntimeException, std::exception) { return !maUNOShapes.empty(); } sal_Int32 SAL_CALL DummyXShapes::getCount() - throw(uno::RuntimeException, std::exception) { return maUNOShapes.size(); } uno::Any SAL_CALL DummyXShapes::getByIndex(sal_Int32 nIndex) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { uno::Any aShape; aShape <<= maUNOShapes[nIndex]; @@ -1108,7 +1060,6 @@ DummyChart::DummyChart(): } void SAL_CALL DummyChart::setPosition( const awt::Point& aPosition ) - throw( uno::RuntimeException, std::exception ) { DummyXShape::setPosition(aPosition); } @@ -1118,7 +1069,6 @@ DummyChart::~DummyChart() } void SAL_CALL DummyChart::setSize( const awt::Size& aSize ) - 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; diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx index 1b3c634e52c8..fddf6a117f62 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -110,53 +110,49 @@ public: DummyXShape(); // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XShape - virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, - const css::uno::Sequence< css::uno::Any >& aValues ) - throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aValues ) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( - const css::uno::Sequence< OUString >& aPropertyNames ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& aPropertyNames ) override; - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, - const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; // XChild - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; // normal non UNO methods @@ -311,9 +307,9 @@ public: virtual void render() override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; private: void setTransformatAsProperty(const css::drawing::HomogenMatrix3& rMatrix); @@ -328,22 +324,22 @@ class DummyXShapes : public DummyXShape, public css::drawing::XShapes { public: - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XShapes - virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; // normal methods virtual void render() override; @@ -360,8 +356,8 @@ public: virtual ~DummyChart() override; virtual DummyChart* getRootShape() override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; virtual void render() override; @@ -386,10 +382,10 @@ class DummyGroup2D : public DummyXShapes public: explicit DummyGroup2D(const OUString& rName); - virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; }; class DummyGroup3D : public DummyXShapes diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx index 30597f83f578..302ce68f2a2f 100644 --- a/chart2/source/view/main/Linear3DTransformation.cxx +++ b/chart2/source/view/main/Linear3DTransformation.cxx @@ -39,8 +39,6 @@ Linear3DTransformation::~Linear3DTransformation() // ____ XTransformation ____ Sequence< double > SAL_CALL Linear3DTransformation::transform( const Sequence< double >& rSourceValues ) - throw (RuntimeException, - lang::IllegalArgumentException, std::exception) { double fX = rSourceValues[0]; double fY = rSourceValues[1]; @@ -82,13 +80,11 @@ Sequence< double > SAL_CALL Linear3DTransformation::transform( } sal_Int32 SAL_CALL Linear3DTransformation::getSourceDimension() - throw (RuntimeException, std::exception) { return 3; } sal_Int32 SAL_CALL Linear3DTransformation::getTargetDimension() - throw (RuntimeException, std::exception) { return 3; } diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index 326d4086e9ce..65548cc4ace5 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -44,7 +44,6 @@ void PlotterBase::initPlotter( const uno::Reference< drawing::XShapes >& xLogic , const uno::Reference< drawing::XShapes >& xFinalTarget , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory , const OUString& rCID ) - throw (uno::RuntimeException, std::exception) { OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters"); //is only allowed to be called once diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx index e75e2a13b19d..93d6aa26f975 100644 --- a/chart2/source/view/main/VPolarTransformation.cxx +++ b/chart2/source/view/main/VPolarTransformation.cxx @@ -43,8 +43,6 @@ VPolarTransformation::~VPolarTransformation() // ____ XTransformation ____ Sequence< double > SAL_CALL VPolarTransformation::transform( const Sequence< double >& rSourceValues ) - throw (RuntimeException, - lang::IllegalArgumentException, std::exception) { double fScaledLogicAngle = rSourceValues[0]; double fScaledLogicRadius = rSourceValues[1]; @@ -67,13 +65,11 @@ Sequence< double > SAL_CALL VPolarTransformation::transform( } sal_Int32 SAL_CALL VPolarTransformation::getSourceDimension() - throw (RuntimeException, std::exception) { return 3; } sal_Int32 SAL_CALL VPolarTransformation::getTargetDimension() - throw (RuntimeException, std::exception) { return 3; } |