diff options
Diffstat (limited to 'chart2/source/model')
92 files changed, 447 insertions, 1384 deletions
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 |