diff options
Diffstat (limited to 'chart2/source/controller/chartapiwrapper')
45 files changed, 348 insertions, 947 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 69c9183bae25..d18d405eadf0 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -84,40 +84,33 @@ AreaWrapper::~AreaWrapper() // ____ XShape ____ awt::Point SAL_CALL AreaWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { return awt::Point(0,0); } void SAL_CALL AreaWrapper::setPosition( const awt::Point& /*aPosition*/ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set position of chart area" ); } awt::Size SAL_CALL AreaWrapper::getSize() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetPageSize(); } void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set size of chart area" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL AreaWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartArea" ); } // ____ XComponent ____ void SAL_CALL AreaWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -128,14 +121,12 @@ void SAL_CALL AreaWrapper::dispose() void SAL_CALL AreaWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL AreaWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -165,19 +156,16 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties() } OUString SAL_CALL AreaWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Area"); } sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.xml.UserDefinedAttributesSupplier", diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index de77aafe0472..bd5fad7298a1 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -51,37 +51,25 @@ public: virtual ~AreaWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XShape ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index cfab846edcd3..a7b088083ff8 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -412,7 +412,7 @@ AxisWrapper::~AxisWrapper() } // ____ chart::XAxis ____ -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno::RuntimeException, std::exception) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() { if( !m_xAxisTitle.is() ) { @@ -441,7 +441,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno } return m_xAxisTitle; } -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno::RuntimeException, std::exception) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() { if( !m_xMajorGrid.is() ) { @@ -464,7 +464,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno } return m_xMajorGrid; } -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno::RuntimeException, std::exception) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() { if( !m_xMinorGrid.is() ) { @@ -490,42 +490,35 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno // ____ XShape ____ awt::Point SAL_CALL AxisWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { awt::Point aResult( m_spChart2ModelContact->GetAxisPosition( this->getAxis() ) ); return aResult; } void SAL_CALL AxisWrapper::setPosition( const awt::Point& /*aPosition*/ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set position of Axis" ); } awt::Size SAL_CALL AxisWrapper::getSize() - throw (uno::RuntimeException, std::exception) { awt::Size aSize( m_spChart2ModelContact->GetAxisSize( this->getAxis() ) ); return aSize; } void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set size of Axis" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL AxisWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString("com.sun.star.chart.ChartAxis"); } // ____ XNumberFormatsSupplier ____ uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSettings() - throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY ); if( xNumSuppl.is() ) @@ -535,7 +528,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSetti } uno::Reference< util::XNumberFormats > SAL_CALL AxisWrapper::getNumberFormats() - throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY ); if( xNumSuppl.is() ) @@ -563,7 +555,6 @@ void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDim // ____ XComponent ____ void SAL_CALL AxisWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -577,14 +568,12 @@ void SAL_CALL AxisWrapper::dispose() void SAL_CALL AxisWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL AxisWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -691,19 +680,16 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties() } OUString SAL_CALL AxisWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Axis"); } sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL AxisWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartAxis", diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 352778b8f0b3..4adc3b77ff36 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -67,12 +67,9 @@ public: static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis ); /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; @@ -80,42 +77,31 @@ public: virtual css::awt::Size getCurrentSizeForReference() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; // ____ chart::XAxis ____ - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getAxisTitle( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMajorGrid( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinorGrid( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getAxisTitle( ) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMajorGrid( ) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinorGrid( ) override; // ____ XShape ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XNumberFormatsSupplier ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() override; virtual css::uno::Reference< - css::util::XNumberFormats > SAL_CALL getNumberFormats() - throw (css::uno::RuntimeException, std::exception) override; + css::util::XNumberFormats > SAL_CALL getNumberFormats() override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 2378a1d579bf..705f9fc2eb1e 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -413,7 +413,6 @@ ChartDataWrapper::~ChartDataWrapper() // ____ XChartDataArray (read)____ Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData() - throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -421,7 +420,6 @@ Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData() return Sequence< Sequence< double > >(); } Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions() - throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -429,7 +427,6 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions() return Sequence< OUString >(); } Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions() - throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -438,14 +435,14 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions() } // ____ XComplexDescriptionAccess (read) ____ -Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() { initDataAccess(); if( m_xDataAccess.is() ) return m_xDataAccess->getComplexRowDescriptions(); return Sequence< Sequence< OUString > >(); } -Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions() { initDataAccess(); if( m_xDataAccess.is() ) @@ -454,14 +451,14 @@ Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDesc } // ____ XAnyDescriptionAccess (read) ____ -Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() { initDataAccess(); if( m_xDataAccess.is() ) return m_xDataAccess->getAnyRowDescriptions(); return Sequence< Sequence< uno::Any > >(); } -Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions() { initDataAccess(); if( m_xDataAccess.is() ) @@ -470,7 +467,7 @@ Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescript } // ____ XDateCategories (read) ____ -Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::RuntimeException, std::exception) +Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() { initDataAccess(); Reference< XDateCategories > xDateCategories( m_xDataAccess, uno::UNO_QUERY ); @@ -481,50 +478,47 @@ Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::Ru // ____ XChartDataArray (write)____ void SAL_CALL ChartDataWrapper::setData( const Sequence< Sequence< double > >& rData ) - throw (uno::RuntimeException, std::exception) { lcl_DataOperator aOperator( rData ); applyData( aOperator ); } void SAL_CALL ChartDataWrapper::setRowDescriptions( const Sequence< OUString >& rRowDescriptions ) - throw (uno::RuntimeException, std::exception) { lcl_RowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } void SAL_CALL ChartDataWrapper::setColumnDescriptions( const Sequence< OUString >& rColumnDescriptions ) - throw (uno::RuntimeException, std::exception) { lcl_ColumnDescriptionsOperator aOperator( rColumnDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } // ____ XComplexDescriptionAccess (write) ____ -void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& rRowDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& rRowDescriptions ) { lcl_ComplexRowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } -void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions ) { lcl_ComplexColumnDescriptionsOperator aOperator( rColumnDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } // ____ XAnyDescriptionAccess (write) ____ -void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions ) { lcl_AnyRowDescriptionsOperator aOperator( rRowDescriptions ); applyData( aOperator ); } -void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) { lcl_AnyColumnDescriptionsOperator aOperator( rColumnDescriptions ); applyData( aOperator ); } // ____ XDateCategories (write) ____ -void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); ControllerLockGuardUNO aCtrlLockGuard( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY )); @@ -536,26 +530,22 @@ void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDa // ____ XChartData (base of XChartDataArray) ____ void SAL_CALL ChartDataWrapper::addChartDataChangeEventListener( const uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( aListener ); } void SAL_CALL ChartDataWrapper::removeChartDataChangeEventListener( const uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } double SAL_CALL ChartDataWrapper::getNotANumber() - throw (uno::RuntimeException, std::exception) { return DBL_MIN; } sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber ) - throw (uno::RuntimeException, std::exception) { return DBL_MIN == nNumber || ::rtl::math::isNan( nNumber ) @@ -564,7 +554,6 @@ sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber ) // ____ XComponent ____ void SAL_CALL ChartDataWrapper::dispose() - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this ))); m_xDataAccess=nullptr; @@ -572,21 +561,18 @@ void SAL_CALL ChartDataWrapper::dispose() void SAL_CALL ChartDataWrapper::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL ChartDataWrapper::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } // ____ XEventListener ____ void SAL_CALL ChartDataWrapper::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { } @@ -702,19 +688,16 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) } OUString SAL_CALL ChartDataWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ChartData"); } sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartDataWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartDataArray", diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 34a35ee7643b..a15a2d06ab70 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -54,77 +54,56 @@ public: virtual ~ChartDataWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: // ____ XDateCategories ____ - virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL getDateCategories() override; + virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) override; // ____ XAnyDescriptionAccess ____ virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL - getAnyRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getAnyRowDescriptions() override; virtual void SAL_CALL setAnyRowDescriptions( - const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) override; virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL - getAnyColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getAnyColumnDescriptions() override; virtual void SAL_CALL setAnyColumnDescriptions( - const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) override; // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL - getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getComplexRowDescriptions() override; virtual void SAL_CALL setComplexRowDescriptions( - const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) override; virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL - getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getComplexColumnDescriptions() override; virtual void SAL_CALL setComplexColumnDescriptions( - const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) override; // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ - virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() override; + virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() override; + virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) override; // ____ XChartData (base of XChartDataArray) ____ - virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getNotANumber() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override; + virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override; + virtual double SAL_CALL getNotANumber() override; + virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // ____ XEventListener ____ - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; void fireChartDataChangeEvent( css::chart::ChartDataChangeEvent& aEvent ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 4f46ea84cb16..f98a743814c4 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -273,14 +273,11 @@ class WrappedDataSourceLabelsInFirstRowProperty : public WrappedProperty public: explicit WrappedDataSourceLabelsInFirstRowProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -296,7 +293,6 @@ WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProp } void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bLabelsInFirstRow = true; if( ! (rOuterValue >>= bLabelsInFirstRow) ) @@ -329,7 +325,6 @@ void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOu } Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OUString aRangeString; bool bUseColumns = true; @@ -353,7 +348,6 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference } Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= true; @@ -366,14 +360,11 @@ class WrappedDataSourceLabelsInFirstColumnProperty : public WrappedProperty public: explicit WrappedDataSourceLabelsInFirstColumnProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -389,7 +380,6 @@ WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColu } void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bLabelsInFirstRow = true; if( ! (rOuterValue >>= bLabelsInFirstRow) ) @@ -422,7 +412,6 @@ void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& } Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OUString aRangeString; bool bUseColumns = true; @@ -446,7 +435,6 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Refere } Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= true; @@ -459,14 +447,11 @@ class WrappedHasLegendProperty : public WrappedProperty public: explicit WrappedHasLegendProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -479,7 +464,6 @@ WrappedHasLegendProperty::WrappedHasLegendProperty(const std::shared_ptr<Chart2M } void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) @@ -505,7 +489,6 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R } Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; try @@ -525,7 +508,6 @@ Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropert } Any WrappedHasLegendProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -538,14 +520,11 @@ class WrappedHasMainTitleProperty : public WrappedProperty public: explicit WrappedHasMainTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -558,7 +537,6 @@ WrappedHasMainTitleProperty::WrappedHasMainTitleProperty(const std::shared_ptr<C } void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) @@ -578,7 +556,6 @@ void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, cons } Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; try @@ -593,7 +570,6 @@ Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XProp } Any WrappedHasMainTitleProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -606,14 +582,11 @@ class WrappedHasSubTitleProperty : public WrappedProperty public: explicit WrappedHasSubTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -626,7 +599,6 @@ WrappedHasSubTitleProperty::WrappedHasSubTitleProperty(const std::shared_ptr<Cha } void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) @@ -646,7 +618,6 @@ void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const } Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; try @@ -661,7 +632,6 @@ Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPrope } Any WrappedHasSubTitleProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -683,7 +653,6 @@ ChartDocumentWrapper::~ChartDocumentWrapper() // ____ XInterface (for new interfaces) ____ uno::Any SAL_CALL ChartDocumentWrapper::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException, std::exception) { if( m_xDelegator.is()) // calls queryAggregation if the delegator doesn't know aType @@ -694,7 +663,6 @@ uno::Any SAL_CALL ChartDocumentWrapper::queryInterface( const uno::Type& aType ) // ____ chart::XChartDocument (old API wrapper) ____ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle() - throw (uno::RuntimeException, std::exception) { if( !m_xTitle.is() ) { @@ -705,7 +673,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle() } Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle() - throw (uno::RuntimeException, std::exception) { if( !m_xSubTitle.is() ) { @@ -716,7 +683,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle() } Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend() - throw (uno::RuntimeException, std::exception) { if( ! m_xLegend.is()) { @@ -728,7 +694,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend() } Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea() - throw (uno::RuntimeException, std::exception) { if( ! m_xArea.is()) { @@ -740,7 +705,6 @@ Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea() } Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram() - throw (uno::RuntimeException, std::exception) { if( !m_xDiagram.is() ) { @@ -758,7 +722,6 @@ Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram() } void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { uno::Reference< util::XRefreshable > xAddIn( xDiagram, uno::UNO_QUERY ); if( xAddIn.is() ) @@ -791,7 +754,6 @@ void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDi } Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData() - throw (uno::RuntimeException, std::exception) { if( !m_xChartData.is() ) { @@ -803,7 +765,6 @@ Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData() } void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& xNewData ) - throw (uno::RuntimeException, std::exception) { if( !xNewData.is() ) return; @@ -816,7 +777,6 @@ void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& x sal_Bool SAL_CALL ChartDocumentWrapper::attachResource( const OUString& URL, const Sequence< beans::PropertyValue >& Arguments ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -825,7 +785,6 @@ sal_Bool SAL_CALL ChartDocumentWrapper::attachResource( } OUString SAL_CALL ChartDocumentWrapper::getURL() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -834,7 +793,6 @@ OUString SAL_CALL ChartDocumentWrapper::getURL() } Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -843,7 +801,6 @@ Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs() } void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::XController >& Controller ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -852,7 +809,6 @@ void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::X void SAL_CALL ChartDocumentWrapper::disconnectController( const Reference< frame::XController >& Controller ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -860,7 +816,6 @@ void SAL_CALL ChartDocumentWrapper::disconnectController( } void SAL_CALL ChartDocumentWrapper::lockControllers() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -868,7 +823,6 @@ void SAL_CALL ChartDocumentWrapper::lockControllers() } void SAL_CALL ChartDocumentWrapper::unlockControllers() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -876,7 +830,6 @@ void SAL_CALL ChartDocumentWrapper::unlockControllers() } sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -885,7 +838,6 @@ sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked() } Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentController() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -895,8 +847,6 @@ Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentControl void SAL_CALL ChartDocumentWrapper::setCurrentController( const Reference< frame::XController >& Controller ) - throw (container::NoSuchElementException, - uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -904,7 +854,6 @@ void SAL_CALL ChartDocumentWrapper::setCurrentController( } Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -914,7 +863,6 @@ Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection( // ____ XComponent ____ void SAL_CALL ChartDocumentWrapper::dispose() - throw (uno::RuntimeException, std::exception) { if( m_bIsDisposed ) throw lang::DisposedException("ChartDocumentWrapper is disposed", @@ -1074,7 +1022,6 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const } void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -1082,7 +1029,6 @@ void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEv } void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -1091,13 +1037,11 @@ void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang:: // ____ XDrawPageSupplier ____ uno::Reference< drawing::XDrawPage > SAL_CALL ChartDocumentWrapper::getDrawPage() - throw (uno::RuntimeException, std::exception) { return this->impl_getDrawPage(); } uno::Reference< drawing::XDrawPage > ChartDocumentWrapper::impl_getDrawPage() const - throw (uno::RuntimeException) { return m_spChart2ModelContact->getDrawPage(); } @@ -1123,8 +1067,6 @@ uno::Reference< lang::XMultiServiceFactory > getShapeFactory(const uno::Referenc // ____ XMultiServiceFactory ____ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( const OUString& aServiceSpecifier ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; @@ -1411,8 +1353,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { OSL_ENSURE( Arguments.getLength(), "createInstanceWithArguments: Warning: Arguments are ignored" ); (void)(Arguments); @@ -1421,7 +1361,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceW } uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceNames() - throw (uno::RuntimeException, std::exception) { return comphelper::mapKeysToSequence( lcl_getStaticServiceNameMap() ); } @@ -1429,7 +1368,6 @@ uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceName // ____ XAggregation ____ void SAL_CALL ChartDocumentWrapper::setDelegator( const uno::Reference< uno::XInterface >& rDelegator ) - throw (uno::RuntimeException, std::exception) { if( m_bIsDisposed ) { @@ -1460,7 +1398,6 @@ void SAL_CALL ChartDocumentWrapper::setDelegator( } uno::Any SAL_CALL ChartDocumentWrapper::queryAggregation( const uno::Type& rType ) - throw (uno::RuntimeException, std::exception) { return ChartDocumentWrapper_Base::queryInterface( rType ); } @@ -1516,19 +1453,16 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert } OUString SAL_CALL ChartDocumentWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartDocumentWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartDocument", diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index a480d30057df..f83bc35c5cc8 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -259,14 +259,11 @@ class WrappedAttachedAxisProperty : public ::chart::WrappedProperty public: explicit WrappedAttachedAxisProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -280,7 +277,6 @@ WrappedAttachedAxisProperty::WrappedAttachedAxisProperty( } Any WrappedAttachedAxisProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= css::chart::ChartAxisAssign::PRIMARY_Y; @@ -288,7 +284,6 @@ Any WrappedAttachedAxisProperty::getPropertyDefault( const Reference< beans::XPr } Any WrappedAttachedAxisProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; @@ -302,7 +297,6 @@ Any WrappedAttachedAxisProperty::getPropertyValue( const Reference< beans::XProp } void WrappedAttachedAxisProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { uno::Reference< chart2::XDataSeries > xDataSeries( xInnerPropertySet, uno::UNO_QUERY ); @@ -364,14 +358,11 @@ class WrappedLineColorProperty : public WrappedSeriesAreaOrLineProperty public: explicit WrappedLineColorProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper ); - virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; @@ -389,7 +380,6 @@ WrappedLineColorProperty::WrappedLineColorProperty( } void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) m_aOuterValue = rOuterValue; @@ -398,7 +388,6 @@ void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const R } void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) m_aOuterValue = m_aDefaultValue; @@ -407,7 +396,6 @@ void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPr } Any WrappedLineColorProperty::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { if( m_pDataSeriesPointWrapper && !m_pDataSeriesPointWrapper->isSupportingAreaProperties() ) return m_aDefaultValue; @@ -420,11 +408,9 @@ class WrappedLineStyleProperty : public WrappedSeriesAreaOrLineProperty public: explicit WrappedLineStyleProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper ); - virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; @@ -442,7 +428,6 @@ WrappedLineStyleProperty::WrappedLineStyleProperty( } void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { Any aNewValue(rOuterValue); if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) @@ -454,7 +439,6 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R } void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) m_aOuterValue = m_aDefaultValue; @@ -482,7 +466,6 @@ DataSeriesPointWrapper::DataSeriesPointWrapper(const std::shared_ptr<Chart2Model } void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw ( uno::Exception, uno::RuntimeException, std::exception) { OSL_PRECOND(aArguments.getLength() >= 1,"need at least 1 argument to initialize the DataSeriesPointWrapper: series reference + optional datapoint index"); @@ -527,7 +510,6 @@ DataSeriesPointWrapper::~DataSeriesPointWrapper() // ____ XComponent ____ void SAL_CALL DataSeriesPointWrapper::dispose() - throw (uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -538,21 +520,18 @@ void SAL_CALL DataSeriesPointWrapper::dispose() void SAL_CALL DataSeriesPointWrapper::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL DataSeriesPointWrapper::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } // ____ XEventListener ____ void SAL_CALL DataSeriesPointWrapper::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException, std::exception) { } @@ -623,7 +602,6 @@ awt::Size DataSeriesPointWrapper::getCurrentSizeForReference() //XPropertyState beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); try @@ -688,7 +666,6 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU } void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( m_eType == DATA_SERIES ) WrappedPropertySet::setPropertyToDefault( rPropertyName ); @@ -699,7 +676,6 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPro } } Any SAL_CALL DataSeriesPointWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; try @@ -800,7 +776,6 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope } void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if(rPropertyName == "Lines") { @@ -861,7 +836,6 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert } Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rPropertyName ) - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( m_eType == DATA_POINT ) { @@ -890,19 +864,16 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty } OUString SAL_CALL DataSeriesPointWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.DataSeries"); } sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DataSeriesPointWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartDataRowProperties", diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index c2bcf4ea3cdc..6f3120b40502 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -73,16 +73,12 @@ public: bool isLinesForbidden() { return !m_bLinesAllowed;} /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ___lang::XInitialization___ - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; @@ -91,28 +87,24 @@ public: protected: // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // ____ XEventListener ____ - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; protected: // ____ WrappedPropertySet ____ virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual const std::vector< WrappedProperty* > createWrappedProperties() override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; //own methods css::uno::Reference< css::chart2::XDataSeries > getDataSeries(); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 2d33bf349f8e..ffb4fd92f2ff 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -635,7 +635,6 @@ DiagramWrapper::~DiagramWrapper() // ____ XDiagram ____ OUString SAL_CALL DiagramWrapper::getDiagramType() - throw (uno::RuntimeException, std::exception) { OUString aRet; @@ -682,8 +681,6 @@ OUString SAL_CALL DiagramWrapper::getDiagramType() Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDataRowProperties( sal_Int32 nRow ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( nRow < 0 ) throw lang::IndexOutOfBoundsException("DataSeries index invalid", @@ -703,8 +700,6 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( nCol < 0 || nRow < 0 ) throw lang::IndexOutOfBoundsException("DataSeries index invalid", @@ -727,14 +722,12 @@ Reference< // ____ XShape (base of XDiagram) ____ awt::Point SAL_CALL DiagramWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { awt::Point aPosition = ToPoint( m_spChart2ModelContact->GetDiagramRectangleIncludingAxes() ); return aPosition; } void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); @@ -759,15 +752,12 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL DiagramWrapper::getSize() - throw (uno::RuntimeException, std::exception) { awt::Size aSize = ToSize( m_spChart2ModelContact->GetDiagramRectangleIncludingAxes() ); return aSize; } void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); @@ -794,14 +784,13 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL DiagramWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.Diagram" ); } // ____ XDiagramPositioning ____ -void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::RuntimeException, std::exception) +void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); @@ -811,7 +800,7 @@ void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::Runti xDiaProps->setPropertyValue( "RelativePosition", Any() ); } } -sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) { uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) @@ -823,7 +812,7 @@ sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) throw (uno:: } return true; } -void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect ) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect ); @@ -831,7 +820,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectan if( xDiaProps.is() ) xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(true) ); } -sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() { uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) @@ -847,11 +836,11 @@ sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::Ru } return false; } -awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes( ) throw (uno::RuntimeException, std::exception) +awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes( ) { return m_spChart2ModelContact->GetDiagramRectangleExcludingAxes(); } -void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect ) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect ); @@ -859,24 +848,23 @@ void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectan if( xDiaProps.is() ) xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(false) ); } -awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes( ) throw (uno::RuntimeException, std::exception) +awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes( ) { return m_spChart2ModelContact->GetDiagramRectangleIncludingAxes(); } -void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect ) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); awt::Rectangle aRect( m_spChart2ModelContact->SubstractAxisTitleSizes(rPositionRect) ); DiagramWrapper::setDiagramPositionIncludingAxes( aRect ); } -css::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (css::uno::RuntimeException, std::exception) +css::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) { return m_spChart2ModelContact->GetDiagramRectangleIncludingTitle(); } // ____ XAxisSupplier ____ Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex ) - throw (uno::RuntimeException, std::exception) { Reference< XAxis > xAxis; if(!nDimensionIndex) @@ -901,7 +889,6 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex ) } Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensionIndex ) - throw (uno::RuntimeException, std::exception) { Reference< XAxis > xAxis; if(!nDimensionIndex) @@ -921,7 +908,6 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensi // ____ XAxisZSupplier ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -931,7 +917,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -941,7 +926,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -951,7 +935,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xZAxis.is()) m_xZAxis = new AxisWrapper( AxisWrapper::Z_AXIS, m_spChart2ModelContact ); @@ -960,7 +943,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis() // ____ XTwoAxisXSupplier ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xSecondXAxis.is()) m_xSecondXAxis = new AxisWrapper( AxisWrapper::SECOND_X_AXIS, m_spChart2ModelContact ); @@ -969,7 +951,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis() // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -979,7 +960,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xXAxis.is()) m_xXAxis = new AxisWrapper( AxisWrapper::X_AXIS, m_spChart2ModelContact ); @@ -987,7 +967,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -997,7 +976,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -1008,7 +986,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid() // ____ XTwoAxisYSupplier ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xSecondYAxis.is()) m_xSecondYAxis = new AxisWrapper( AxisWrapper::SECOND_Y_AXIS, m_spChart2ModelContact ); @@ -1017,7 +994,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis() // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1027,7 +1003,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xYAxis.is()) m_xYAxis = new AxisWrapper( AxisWrapper::Y_AXIS, m_spChart2ModelContact ); @@ -1035,7 +1010,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1045,7 +1019,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1056,7 +1029,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid() // ____ XSecondAxisTitleSupplier ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getSecondaryAxis(0) ); @@ -1066,7 +1038,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle() } Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getSecondaryAxis(1) ); @@ -1078,7 +1049,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle() // ____ XStatisticDisplay ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getUpBar() - throw (uno::RuntimeException, std::exception) { if( !m_xUpBarWrapper.is() ) { @@ -1089,7 +1059,6 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDownBar() - throw (uno::RuntimeException, std::exception) { if( !m_xDownBarWrapper.is() ) { @@ -1100,7 +1069,6 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getMinMaxLine() - throw (uno::RuntimeException, std::exception) { if( !m_xMinMaxLineWrapper.is() ) { @@ -1111,7 +1079,6 @@ Reference< // ____ X3DDisplay ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall() - throw (uno::RuntimeException, std::exception) { if( !m_xWall.is() ) { @@ -1122,7 +1089,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall() Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getFloor() - throw (uno::RuntimeException, std::exception) { if( !m_xFloor.is() ) { @@ -1133,7 +1099,6 @@ Reference< // ____ X3DDefaultSetter ____ void SAL_CALL DiagramWrapper::set3DSettingsToDefault() - throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1141,7 +1106,6 @@ void SAL_CALL DiagramWrapper::set3DSettingsToDefault() } void SAL_CALL DiagramWrapper::setDefaultRotation() - throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1149,7 +1113,6 @@ void SAL_CALL DiagramWrapper::setDefaultRotation() } void SAL_CALL DiagramWrapper::setDefaultIllumination() - throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1158,7 +1121,6 @@ void SAL_CALL DiagramWrapper::setDefaultIllumination() // ____ XComponent ____ void SAL_CALL DiagramWrapper::dispose() - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this ))); @@ -1180,14 +1142,12 @@ void SAL_CALL DiagramWrapper::dispose() void SAL_CALL DiagramWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL DiagramWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -1198,14 +1158,11 @@ class WrappedDataRowSourceProperty : public WrappedProperty public: explicit WrappedDataRowSourceProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1221,7 +1178,6 @@ WrappedDataRowSourceProperty::WrappedDataRowSourceProperty(const std::shared_ptr } void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { css::chart::ChartDataRowSource eChartDataRowSource = css::chart::ChartDataRowSource_ROWS; if( ! (rOuterValue >>= eChartDataRowSource) ) @@ -1257,7 +1213,6 @@ void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, con } Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OUString aRangeString; bool bUseColumns = true; @@ -1280,7 +1235,6 @@ Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPro } Any WrappedDataRowSourceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= css::chart::ChartDataRowSource_COLUMNS; @@ -1295,14 +1249,11 @@ class WrappedStackingProperty : public WrappedProperty public: WrappedStackingProperty(StackMode eStackMode, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: //methods bool detectInnerValue( StackMode& eInnerStackMode ) const; @@ -1346,7 +1297,6 @@ bool WrappedStackingProperty::detectInnerValue( StackMode& eStackMode ) const } void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -1375,7 +1325,6 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re } Any WrappedStackingProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { StackMode eInnerStackMode; if( detectInnerValue( eInnerStackMode ) ) @@ -1387,7 +1336,6 @@ Any WrappedStackingProperty::getPropertyValue( const Reference< beans::XProperty } Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -1400,14 +1348,11 @@ class WrappedDim3DProperty : public WrappedProperty public: explicit WrappedDim3DProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1423,7 +1368,6 @@ WrappedDim3DProperty::WrappedDim3DProperty(const std::shared_ptr<Chart2ModelCont } void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNew3D = false; if( ! (rOuterValue >>= bNew3D) ) @@ -1441,7 +1385,6 @@ void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Refer } Any WrappedDim3DProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) @@ -1453,7 +1396,6 @@ Any WrappedDim3DProperty::getPropertyValue( const Reference< beans::XPropertySet } Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -1466,14 +1408,11 @@ class WrappedVerticalProperty : public WrappedProperty public: explicit WrappedVerticalProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1489,7 +1428,6 @@ WrappedVerticalProperty::WrappedVerticalProperty(const std::shared_ptr<Chart2Mod } void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewVertical = false; if( ! (rOuterValue >>= bNewVertical) ) @@ -1509,7 +1447,6 @@ void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Re } Any WrappedVerticalProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) @@ -1524,7 +1461,6 @@ Any WrappedVerticalProperty::getPropertyValue( const Reference< beans::XProperty } Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -1537,14 +1473,11 @@ class WrappedNumberOfLinesProperty : public WrappedProperty public: explicit WrappedNumberOfLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: //methods bool detectInnerValue( uno::Any& rInnerValue ) const; @@ -1597,7 +1530,6 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con } void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nNewValue; if( ! (rOuterValue >>= nNewValue) ) @@ -1664,7 +1596,6 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con } Any WrappedNumberOfLinesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( !detectInnerValue( aRet ) ) @@ -1673,7 +1604,6 @@ Any WrappedNumberOfLinesProperty::getPropertyValue( const Reference< beans::XPro } Any WrappedNumberOfLinesProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= sal_Int32( 0 ); @@ -1686,14 +1616,11 @@ class WrappedAttributedDataPointsProperty : public WrappedProperty public: explicit WrappedAttributedDataPointsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1709,7 +1636,6 @@ WrappedAttributedDataPointsProperty::WrappedAttributedDataPointsProperty(const s } void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { uno::Sequence< uno::Sequence< sal_Int32 > > aNewValue; if( ! (rOuterValue >>= aNewValue) ) @@ -1748,7 +1674,6 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal } Any WrappedAttributedDataPointsProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY ); @@ -1781,7 +1706,6 @@ Any WrappedAttributedDataPointsProperty::getPropertyValue( const Reference< bean } Any WrappedAttributedDataPointsProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; uno::Sequence< uno::Sequence< sal_Int32 > > aSeq; @@ -1795,14 +1719,11 @@ class WrappedSolidTypeProperty : public WrappedProperty public: explicit WrappedSolidTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1818,7 +1739,6 @@ WrappedSolidTypeProperty::WrappedSolidTypeProperty(const std::shared_ptr<Chart2M } void WrappedSolidTypeProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nNewSolidType = css::chart::ChartSolidType::RECTANGULAR_SOLID; if( ! (rOuterValue >>= nNewSolidType) ) @@ -1838,7 +1758,6 @@ void WrappedSolidTypeProperty::setPropertyValue( const Any& rOuterValue, const R } Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) @@ -1853,7 +1772,6 @@ Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropert } Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( css::chart::ChartSolidType::RECTANGULAR_SOLID ); } @@ -1863,14 +1781,11 @@ class WrappedAutomaticSizeProperty : public WrappedProperty public: WrappedAutomaticSizeProperty(); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; }; WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty() @@ -1879,7 +1794,6 @@ WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty() } void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( xInnerPropertySet.is() ) { @@ -1904,7 +1818,6 @@ void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, con } Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) @@ -1917,7 +1830,6 @@ Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPro } Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -1930,10 +1842,8 @@ class WrappedIncludeHiddenCellsProperty : public WrappedProperty public: explicit WrappedIncludeHiddenCellsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual Any getPropertyValue(const Reference<beans::XPropertySet>& xInnerPropertySet) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue(const Reference<beans::XPropertySet>& xInnerPropertySet) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1946,7 +1856,6 @@ WrappedIncludeHiddenCellsProperty::WrappedIncludeHiddenCellsProperty(const std:: } void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -1956,7 +1865,6 @@ void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue } Any WrappedIncludeHiddenCellsProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { bool bValue = ChartModelHelper::isIncludeHiddenCells( m_spChart2ModelContact->getChartModel() ); return uno::Any(bValue); @@ -1964,14 +1872,12 @@ Any WrappedIncludeHiddenCellsProperty::getPropertyValue( const Reference< beans: // ____ XDiagramProvider ____ Reference< chart2::XDiagram > SAL_CALL DiagramWrapper::getDiagram() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->getChart2Diagram(); } void SAL_CALL DiagramWrapper::setDiagram( const Reference< chart2::XDiagram >& /*xDiagram*/ ) - throw (uno::RuntimeException, std::exception) { //@todo: remove this method from interface OSL_FAIL("DiagramWrapper::setDiagram is not implemented, should be removed and not be called" ); @@ -2022,19 +1928,16 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties() } OUString SAL_CALL DiagramWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Diagram"); } sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DiagramWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.Diagram", diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 24649f66bc0b..148e4705eb08 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -75,158 +75,116 @@ public: virtual ~DiagramWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; // ____ XDiagram ____ - virtual OUString SAL_CALL getDiagramType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDiagramType() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) override; // ____ XShape (base of XDiagram) ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XAxisSupplier ____ virtual css::uno::Reference< - css::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) override; virtual css::uno::Reference< - css::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) override; // ____ XAxisZSupplier ____ virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getZAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getZAxisTitle() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getZMainGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getZMainGrid() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getZHelpGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getZHelpGrid() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getZAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getZAxis() override; // ____ XTwoAxisXSupplier ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getSecondaryXAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getSecondaryXAxis() override; // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getXAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getXAxisTitle() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getXAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getXAxis() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getXMainGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getXMainGrid() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getXHelpGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getXHelpGrid() override; // ____ XTwoAxisYSupplier ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getSecondaryYAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getSecondaryYAxis() override; // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getYAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getYAxisTitle() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getYAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getYAxis() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getYHelpGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getYHelpGrid() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getYMainGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getYMainGrid() override; // ____ XSecondAxisTitleSupplier ____ virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getSecondXAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getSecondXAxisTitle() override; virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getSecondYAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getSecondYAxisTitle() override; // ____ XStatisticDisplay ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getUpBar() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getUpBar() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getDownBar() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getDownBar() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getMinMaxLine() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getMinMaxLine() override; // ____ X3DDisplay ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getWall() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getWall() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getFloor() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getFloor() override; // ____ X3DDefaultSetter ____ - virtual void SAL_CALL set3DSettingsToDefault() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultRotation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultIllumination() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL set3DSettingsToDefault() override; + virtual void SAL_CALL setDefaultRotation() override; + virtual void SAL_CALL setDefaultIllumination() override; // ____ XDiagramPositioning ____ - virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagramPositionExcludingAxes( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isExcludingDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagramPositionIncludingAxes( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutomaticDiagramPositioning( ) override; + virtual sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) override; + virtual void SAL_CALL setDiagramPositionExcludingAxes( const css::awt::Rectangle& PositionRect ) override; + virtual sal_Bool SAL_CALL isExcludingDiagramPositioning( ) override; + virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) override; + virtual void SAL_CALL setDiagramPositionIncludingAxes( const css::awt::Rectangle& PositionRect ) override; + virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) override; + virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const css::awt::Rectangle& PositionRect ) override; + virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) override; // ____ XDiagramProvider ____ - virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL getDiagram() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL getDiagram() override; + virtual void SAL_CALL setDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index a1ee70db97f0..fb2fb8d7e8e2 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -109,7 +109,6 @@ void GridWrapper::getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDime // ____ XComponent ____ void SAL_CALL GridWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -119,14 +118,12 @@ void SAL_CALL GridWrapper::dispose() void SAL_CALL GridWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL GridWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -170,19 +167,16 @@ const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties() } OUString SAL_CALL GridWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Grid"); } sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartGrid", diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index 818b5fea65b6..2e7097e8e207 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -61,20 +61,14 @@ public: static void getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDimensionIndex, bool& rbSubGrid ); /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 9d4f7ce0ba50..caa5bf8e1eaa 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -57,10 +57,8 @@ class WrappedLegendAlignmentProperty : public WrappedProperty public: WrappedLegendAlignmentProperty(); - virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; protected: virtual Any convertInnerToOuterValue( const Any& rInnerValue ) const override; @@ -73,7 +71,6 @@ WrappedLegendAlignmentProperty::WrappedLegendAlignmentProperty() } Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertySet.is() ) @@ -94,7 +91,6 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP } void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if(xInnerPropertySet.is()) { @@ -280,13 +276,11 @@ LegendWrapper::~LegendWrapper() // ____ XShape ____ awt::Point SAL_CALL LegendWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetLegendPosition(); } void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); if( xProp.is() ) @@ -302,14 +296,11 @@ void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL LegendWrapper::getSize() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetLegendSize(); } void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); if( xProp.is() ) @@ -327,14 +318,12 @@ void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL LegendWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartLegend" ); } // ____ XComponent ____ void SAL_CALL LegendWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -345,14 +334,12 @@ void SAL_CALL LegendWrapper::dispose() void SAL_CALL LegendWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL LegendWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -415,19 +402,16 @@ const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties() } OUString SAL_CALL LegendWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Legend"); } sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartLegend", diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 3c539c6aa779..c59bb25caddc 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -54,12 +54,9 @@ public: virtual ~LegendWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; @@ -67,29 +64,20 @@ public: virtual css::awt::Size getCurrentSizeForReference() override; // ____ XShape ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 4b3f28773c2d..282fcdf5469a 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -130,7 +130,6 @@ MinMaxLineWrapper::~MinMaxLineWrapper() // ____ XComponent ____ void SAL_CALL MinMaxLineWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -138,27 +137,23 @@ void SAL_CALL MinMaxLineWrapper::dispose() void SAL_CALL MinMaxLineWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL MinMaxLineWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL MinMaxLineWrapper::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticMinMaxLineWrapperInfo::get(); } void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropSet(nullptr); @@ -195,7 +190,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName } } uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -237,22 +231,18 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rProperty } void SAL_CALL MinMaxLineWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -260,7 +250,6 @@ void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const OUString& / //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq ) - throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); for(sal_Int32 nN=0; nN<nMinCount; nN++) @@ -278,7 +267,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUStrin //todo: store unknown properties elsewhere } uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const uno::Sequence< OUString >& rNameSeq ) - throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -295,27 +283,23 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const u void SAL_CALL MinMaxLineWrapper::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } //XPropertyState beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) ) return beans::PropertyState_DEFAULT_VALUE; @@ -329,7 +313,6 @@ beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUStrin return beans::PropertyState_DIRECT_VALUE; } uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertyStates( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -344,13 +327,11 @@ uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertySta return aRetSeq; } void SAL_CALL MinMaxLineWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) ); } uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const tPropertyValueMap& rStaticDefaults = *StaticMinMaxLineWrapperDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticMinMaxLineWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) ); @@ -362,7 +343,6 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rProper //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault( ) - throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = *StaticMinMaxLineWrapperPropertyArray::get(); for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++) @@ -372,7 +352,6 @@ void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault( ) } } void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { @@ -381,7 +360,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OU } } uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -397,19 +375,16 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const } OUString SAL_CALL MinMaxLineWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ChartLine"); } sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartLine", diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index 860e70e1923c..07687651e728 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -59,51 +59,45 @@ public: virtual ~MinMaxLineWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; //XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault( ) override; + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index d70606fd28dd..3cbef7fb707d 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -51,12 +51,9 @@ class WrappedTitleStringProperty : public WrappedProperty public: explicit WrappedTitleStringProperty( const Reference< uno::XComponentContext >& xContext ); - virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; protected: Reference< uno::XComponentContext > m_xContext; @@ -69,7 +66,6 @@ WrappedTitleStringProperty::WrappedTitleStringProperty( const Reference< uno::XC } void WrappedTitleStringProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY); if(xTitle.is()) @@ -80,7 +76,6 @@ void WrappedTitleStringProperty::setPropertyValue( const Any& rOuterValue, const } } Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); Reference< chart2::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY); @@ -98,7 +93,6 @@ Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPrope return aRet; } Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( OUString() );//default title is a empty String } @@ -205,13 +199,11 @@ TitleWrapper::~TitleWrapper() // ____ XShape ____ awt::Point SAL_CALL TitleWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetTitlePosition( this->getTitleObject() ); } void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropertySet( this->getInnerPropertySet() ); if(xPropertySet.is()) @@ -227,28 +219,23 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL TitleWrapper::getSize() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetTitleSize( this->getTitleObject() ); } void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set size of title" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL TitleWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartTitle" ); } // ____ XComponent ____ void SAL_CALL TitleWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -259,14 +246,12 @@ void SAL_CALL TitleWrapper::dispose() void SAL_CALL TitleWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL TitleWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -309,7 +294,7 @@ void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue } void TitleWrapper::setFastCharacterPropertyValue( - sal_Int32 nHandle, const Any& rValue ) throw (uno::Exception) + sal_Int32 nHandle, const Any& rValue ) { OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle && nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP ); @@ -336,7 +321,6 @@ void TitleWrapper::setFastCharacterPropertyValue( // WrappedPropertySet void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -348,7 +332,6 @@ void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, con } Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); @@ -360,7 +343,6 @@ Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName ) } beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); @@ -383,7 +365,6 @@ beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rP return aState; } void SAL_CALL TitleWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -395,7 +376,6 @@ void SAL_CALL TitleWrapper::setPropertyToDefault( const OUString& rPropertyName WrappedPropertySet::setPropertyToDefault( rPropertyName ); } Any SAL_CALL TitleWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -419,7 +399,6 @@ Any SAL_CALL TitleWrapper::getPropertyDefault( const OUString& rPropertyName ) } void SAL_CALL TitleWrapper::addPropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -432,7 +411,6 @@ void SAL_CALL TitleWrapper::addPropertyChangeListener( const OUString& rProperty WrappedPropertySet::addPropertyChangeListener( rPropertyName, xListener ); } void SAL_CALL TitleWrapper::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -502,19 +480,16 @@ const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties() } OUString SAL_CALL TitleWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Title"); } sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL TitleWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartTitle", diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index 4017385040b9..b986eb9a2c8c 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -53,12 +53,9 @@ public: virtual ~TitleWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; @@ -67,45 +64,35 @@ public: protected: // ____ XShape ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // character properties have to be handled differently (via the XFormattedString elements) void getFastCharacterPropertyValue( sal_Int32 nHandle, css::uno::Any& rValue ); /// @throws css::uno::Exception - void setFastCharacterPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception); + void setFastCharacterPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ); // ____ WrappedPropertySet ____ - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index ef048b1d945d..19bd0ba2ac1b 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -138,7 +138,6 @@ UpDownBarWrapper::~UpDownBarWrapper() // ____ XComponent ____ void SAL_CALL UpDownBarWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -146,26 +145,22 @@ void SAL_CALL UpDownBarWrapper::dispose() void SAL_CALL UpDownBarWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL UpDownBarWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticUpDownBarWrapperInfo::get(); } void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropSet(nullptr); @@ -187,7 +182,6 @@ void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName, xPropSet->setPropertyValue( rPropertyName, rValue ); } uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -213,22 +207,18 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyN } void SAL_CALL UpDownBarWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -236,7 +226,6 @@ void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const OUString& /* //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq ) - throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); for(sal_Int32 nN=0; nN<nMinCount; nN++) @@ -254,7 +243,6 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString //todo: store unknown properties elsewhere } uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const uno::Sequence< OUString >& rNameSeq ) - throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -269,24 +257,20 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const un return aRetSeq; } void SAL_CALL UpDownBarWrapper::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } //XPropertyState beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { uno::Any aDefault( this->getPropertyDefault( rPropertyName ) ); uno::Any aValue( this->getPropertyValue( rPropertyName ) ); @@ -297,7 +281,6 @@ beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString return beans::PropertyState_DIRECT_VALUE; } uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStates( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -312,13 +295,11 @@ uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStat return aRetSeq; } void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) ); } uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const tPropertyValueMap& rStaticDefaults = *StaticUpDownBarWrapperDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticUpDownBarWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) ); @@ -330,7 +311,6 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropert //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( ) - throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = *StaticUpDownBarWrapperPropertyArray::get(); for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++) @@ -340,7 +320,6 @@ void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( ) } } void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { @@ -349,7 +328,6 @@ void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUS } } uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -365,19 +343,16 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const } OUString SAL_CALL UpDownBarWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ChartArea"); } sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartArea", diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index dca66c5333fc..6e902d487062 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -58,53 +58,47 @@ public: virtual ~UpDownBarWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; //XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault( ) override; + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 9610bb600392..f179264767fe 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -93,7 +93,6 @@ WallFloorWrapper::~WallFloorWrapper() // ____ XComponent ____ void SAL_CALL WallFloorWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -104,14 +103,12 @@ void SAL_CALL WallFloorWrapper::dispose() void SAL_CALL WallFloorWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL WallFloorWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -153,19 +150,16 @@ const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties( } OUString SAL_CALL WallFloorWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.WallOrFloor"); } sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.xml.UserDefinedAttributesSupplier", diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index 60cd15aff708..c49e6c9ccdbd 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -48,20 +48,14 @@ public: virtual ~WallFloorWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx index 241f716c09ca..ffd6baa83711 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx @@ -39,7 +39,6 @@ WrappedAddInProperty::~WrappedAddInProperty() } void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { Reference< util::XRefreshable > xAddIn; if( ! (rOuterValue >>= xAddIn) ) @@ -49,7 +48,6 @@ void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Refer } Any WrappedAddInProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( m_rChartDocumentWrapper.getAddIn() ); } @@ -64,7 +62,6 @@ WrappedBaseDiagramProperty::~WrappedBaseDiagramProperty() } void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { OUString aBaseDiagram; if( ! (rOuterValue >>= aBaseDiagram) ) @@ -74,7 +71,6 @@ void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const } Any WrappedBaseDiagramProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( m_rChartDocumentWrapper.getBaseDiagram() ); } @@ -89,13 +85,11 @@ WrappedAdditionalShapesProperty::~WrappedAdditionalShapesProperty() } void WrappedAdditionalShapesProperty::setPropertyValue( const Any& /*rOuterValue*/, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { throw lang::IllegalArgumentException( "AdditionalShapes is a read only property", nullptr, 0 ); } Any WrappedAdditionalShapesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( m_rChartDocumentWrapper.getAdditionalShapes() ); } @@ -110,7 +104,6 @@ WrappedRefreshAddInAllowedProperty::~WrappedRefreshAddInAllowedProperty() } void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bUpdateAddIn = true; if( ! (rOuterValue >>= bUpdateAddIn) ) @@ -120,7 +113,6 @@ void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValu } Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( m_rChartDocumentWrapper.getUpdateAddIn() ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx index fc7ea946935b..a95bf97bc4f9 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx @@ -33,11 +33,9 @@ public: explicit WrappedAddInProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedAddInProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -49,11 +47,9 @@ public: explicit WrappedBaseDiagramProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedBaseDiagramProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -65,11 +61,9 @@ public: explicit WrappedAdditionalShapesProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedAdditionalShapesProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -81,11 +75,9 @@ public: explicit WrappedRefreshAddInAllowedProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedRefreshAddInAllowedProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 605fd723cb86..39bcb5140f41 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -38,12 +38,9 @@ class WrappedAutomaticPositionProperty : public WrappedProperty public: WrappedAutomaticPositionProperty(); - virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; }; WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty() @@ -52,7 +49,6 @@ WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty() } void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( xInnerPropertySet.is() ) { @@ -77,7 +73,6 @@ void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, } Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) @@ -90,7 +85,6 @@ Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans:: } Any WrappedAutomaticPositionProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 8aebd9fb02cb..bd80bbd16009 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -38,14 +38,11 @@ public: WrappedAxisAndGridExistenceProperty( bool bAxis, bool bMain, sal_Int32 nDimensionIndex , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -139,7 +136,6 @@ WrappedAxisAndGridExistenceProperty::WrappedAxisAndGridExistenceProperty( bool b } void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -169,7 +165,6 @@ void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterVal } Any WrappedAxisAndGridExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); @@ -187,7 +182,6 @@ Any WrappedAxisAndGridExistenceProperty::getPropertyValue( const Reference< bean } Any WrappedAxisAndGridExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -200,14 +194,11 @@ public: WrappedAxisTitleExistenceProperty( sal_Int32 nTitleIndex , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -256,7 +247,6 @@ WrappedAxisTitleExistenceProperty::WrappedAxisTitleExistenceProperty(sal_Int32 n } void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -281,7 +271,6 @@ void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue } Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { bool bHasTitle = false; @@ -296,7 +285,6 @@ Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans: } Any WrappedAxisTitleExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -309,14 +297,11 @@ public: WrappedAxisLabelExistenceProperty( bool bMain, sal_Int32 nDimensionIndex , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -357,7 +342,6 @@ WrappedAxisLabelExistenceProperty::WrappedAxisLabelExistenceProperty(bool bMain, } void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -383,7 +367,6 @@ void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue } Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); @@ -396,7 +379,6 @@ Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans: } Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= true; diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index 78a0076f82f8..0a63ae3cb19a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -51,7 +51,6 @@ void WrappedCharacterHeightProperty::addWrappedProperties( std::vector< WrappedP } void WrappedCharacterHeightProperty_Base::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if(xInnerPropertySet.is()) { @@ -62,7 +61,6 @@ void WrappedCharacterHeightProperty_Base::setPropertyValue( const Any& rOuterVal } Any WrappedCharacterHeightProperty_Base::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertySet.is() ) @@ -87,7 +85,6 @@ Any WrappedCharacterHeightProperty_Base::getPropertyValue( const Reference< bean } Any WrappedCharacterHeightProperty_Base::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertyState.is() ) @@ -98,7 +95,6 @@ Any WrappedCharacterHeightProperty_Base::getPropertyDefault( const Reference< be } beans::PropertyState WrappedCharacterHeightProperty_Base::getPropertyState( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { return beans::PropertyState_DIRECT_VALUE; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx index cd065de41d33..6902ebb91b86 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx @@ -36,17 +36,13 @@ public: WrappedCharacterHeightProperty_Base( const OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider ); virtual ~WrappedCharacterHeightProperty_Base() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; - virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override; diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx index 9e135594fe82..93bbda452c22 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx @@ -55,9 +55,7 @@ public: WrappedGL3DProperty( const OUString& rInName, const OUString& rOutName, const uno::Any& rDefault, const std::shared_ptr<Chart2ModelContact>& pContact ) : WrappedProperty(rInName, rOutName), maDefault(rDefault), mpModelContact(pContact) {} - virtual uno::Any getPropertyValue( const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) override + virtual uno::Any getPropertyValue( const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const override { uno::Reference<chart2::XChartType> xCT = getChartType(); if (!xCT.is()) @@ -74,10 +72,7 @@ public: }; virtual void setPropertyValue( - const uno::Any& rOutValue, const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) override + const uno::Any& rOutValue, const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const override { uno::Reference<chart2::XChartType> xCT = getChartType(); if (!xCT.is()) @@ -91,8 +86,7 @@ public: catch ( const uno::Exception& ) {} } - virtual void setPropertyToDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPropState*/ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override + virtual void setPropertyToDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPropState*/ ) const override { uno::Reference<chart2::XChartType> xCT = getChartType(); if (!xCT.is()) @@ -106,15 +100,12 @@ public: catch ( const uno::Exception& ) {} } - virtual uno::Any getPropertyDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) override + virtual uno::Any getPropertyDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const override { return maDefault; } - virtual beans::PropertyState getPropertyState( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override + virtual beans::PropertyState getPropertyState( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const override { return beans::PropertyState_DIRECT_VALUE; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 68d9681345e9..57fa2a3aa3c2 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -59,7 +59,6 @@ WrappedBarPositionProperty_Base::~WrappedBarPositionProperty_Base() } void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nNewValue = 0; if( ! (rOuterValue >>= nNewValue) ) @@ -109,7 +108,6 @@ void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue, } Any WrappedBarPositionProperty_Base::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index 27b51f40a9a4..8838ed066d1a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -39,11 +39,9 @@ public: , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); virtual ~WrappedBarPositionProperty_Base() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; void setDimensionAndAxisIndex( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 966dead7aad7..0b41f8900c9a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -42,7 +42,6 @@ WrappedNumberFormatProperty::~WrappedNumberFormatProperty() } void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nFormat = 0; if( ! (rOuterValue >>= nFormat) ) @@ -53,7 +52,6 @@ void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, cons } Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { if( !xInnerPropertySet.is() ) { @@ -78,7 +76,6 @@ Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XProp } Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( sal_Int32( 0 ) ); } @@ -93,7 +90,6 @@ WrappedLinkNumberFormatProperty::~WrappedLinkNumberFormatProperty() } void WrappedLinkNumberFormatProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( !xInnerPropertySet.is() ) { @@ -105,7 +101,6 @@ void WrappedLinkNumberFormatProperty::setPropertyValue( const Any& rOuterValue, } Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { if( !xInnerPropertySet.is() ) { @@ -117,7 +112,6 @@ Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::X } Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { bool bLink = true; return uno::makeAny( bLink ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx index 567e9320c597..296e1fcc7262 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx @@ -37,14 +37,11 @@ public: explicit WrappedNumberFormatProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedNumberFormatProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; friend class WrappedLinkNumberFormatProperty; private: @@ -57,14 +54,11 @@ public: explicit WrappedLinkNumberFormatProperty(); virtual ~WrappedLinkNumberFormatProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index 2be350b47a0f..bd042609183e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -125,19 +125,16 @@ void WrappedScaleProperty::addWrappedProperties( std::vector< WrappedProperty* > } void WrappedScaleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { setPropertyValue( m_eScaleProperty, rOuterValue, xInnerPropertySet ); } Any WrappedScaleProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return getPropertyValue( m_eScaleProperty, xInnerPropertySet ); } void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { m_aOuterValue = rOuterValue; @@ -345,7 +342,6 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons } Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( m_aOuterValue ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx index 164731da68ca..35bd6b30bcf7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx @@ -59,11 +59,9 @@ public: static void addWrappedProperties( std::vector< WrappedProperty* >& rList, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; protected: //methods /// @throws css::beans::UnknownPropertyException @@ -71,13 +69,11 @@ protected: //methods /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - void setPropertyValue( tScaleProperty eScaleProperty, const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); + void setPropertyValue( tScaleProperty eScaleProperty, const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const; /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + css::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 6d19e2ef31c5..5bdd1404089c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -38,12 +38,9 @@ class WrappedScaleTextProperty : public WrappedProperty public: explicit WrappedScaleTextProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -56,7 +53,6 @@ WrappedScaleTextProperty::WrappedScaleTextProperty(const std::shared_ptr<Chart2M } void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { static const char aRefSizeName[] = "ReferencePageSize"; @@ -87,7 +83,6 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R } Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) @@ -102,7 +97,6 @@ Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropert } Any WrappedScaleTextProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index fb1fa0360d4d..0de7f6d77378 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -50,7 +50,6 @@ WrappedD3DTransformMatrixProperty::~WrappedD3DTransformMatrixProperty() } void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( DiagramHelper::isPieOrDonutChart( m_spChart2ModelContact->getChart2Diagram() ) ) { @@ -76,7 +75,6 @@ void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue } Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { if( DiagramHelper::isPieOrDonutChart( m_spChart2ModelContact->getChart2Diagram() ) ) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx index 36564addd3c2..e587f417296c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx @@ -44,11 +44,9 @@ public: const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); virtual ~WrappedD3DTransformMatrixProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 14bbb7d4fd5e..e5ba28c44b45 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -109,8 +109,7 @@ public: } } } - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override { PROPERTYTYPE aNewValue = PROPERTYTYPE(); if( ! (rOuterValue >>= aNewValue) ) @@ -134,8 +133,7 @@ public: } } - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override { if( m_ePropertyType == DIAGRAM ) { @@ -158,8 +156,7 @@ public: } } - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /* xInnerPropertyState */ ) const override { return m_aDefaultValue; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index e7af4fffaf94..9b1d869ee5e7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -93,8 +93,7 @@ public: } return bHasDetectableInnerValue; } - void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const override { PROPERTYTYPE aNewValue; if( ! (rOuterValue >>= aNewValue) ) @@ -131,8 +130,7 @@ public: } } - css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const override { bool bHasAmbiguousValue = false; PROPERTYTYPE aValue; @@ -143,8 +141,7 @@ public: return m_aOuterValue; } - css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const override { return m_aDefaultValue; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 1b95c37d9252..c7f16fe0d61b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -42,11 +42,9 @@ public: , const css::uno::Any& rDefaulValue , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ); - void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; virtual uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const = 0; @@ -67,7 +65,6 @@ WrappedStockProperty::WrappedStockProperty( const OUString& rOuterName } void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -104,7 +101,6 @@ void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, c } css::uno::Any WrappedStockProperty::getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { return m_aDefaultValue; } @@ -114,8 +110,7 @@ class WrappedVolumeProperty : public WrappedStockProperty public: explicit WrappedVolumeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override; }; @@ -126,7 +121,6 @@ WrappedVolumeProperty::WrappedVolumeProperty(const std::shared_ptr<Chart2ModelCo } css::uno::Any WrappedVolumeProperty::getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); @@ -181,8 +175,7 @@ class WrappedUpDownProperty : public WrappedStockProperty public: explicit WrappedUpDownProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact); - css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override; }; @@ -193,7 +186,6 @@ WrappedUpDownProperty::WrappedUpDownProperty(const std::shared_ptr<Chart2ModelCo } css::uno::Any WrappedUpDownProperty::getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 1f8a99eff6c5..ba107ea2e72b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -55,10 +55,8 @@ public: virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; explicit WrappedSymbolTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType); @@ -79,8 +77,7 @@ class WrappedSymbolSizeProperty : public WrappedSeriesOrDiagramProperty< awt::Si public: virtual awt::Size getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const awt::Size& aNewSize ) const override; - virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override; + virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; explicit WrappedSymbolSizeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType); @@ -91,8 +88,7 @@ class WrappedSymbolAndLinesProperty : public WrappedSeriesOrDiagramProperty< boo public: virtual bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const bool& bDrawLines ) const override; - virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override; + virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; explicit WrappedSymbolAndLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType); @@ -242,7 +238,6 @@ void WrappedSymbolTypeProperty::setValueToSeries( const Reference< beans::XPrope } Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { //the old chart (< OOo 2.3) needs symbol-type="automatic" at the plot-area if any of the series should be able to have symbols if( m_ePropertyType == DIAGRAM ) @@ -274,7 +269,6 @@ Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XProper } beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { //the special situation for this property here is that the diagram default can be //different from the normal default and different from all singles series values @@ -451,7 +445,6 @@ void WrappedSymbolSizeProperty::setValueToSeries( } beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { //only export symbol size if necessary if( m_ePropertyType == DIAGRAM ) @@ -511,7 +504,6 @@ void WrappedSymbolAndLinesProperty::setValueToSeries( } beans::PropertyState WrappedSymbolAndLinesProperty::getPropertyState( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { //do not export this property anymore, instead use a linestyle none for no lines return beans::PropertyState_DEFAULT_VALUE; diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx index 9d496a3d9886..bd371b35b80e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx @@ -37,7 +37,6 @@ WrappedTextRotationProperty::~WrappedTextRotationProperty() } beans::PropertyState WrappedTextRotationProperty::getPropertyState( const uno::Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { if( m_bDirectState ) return beans::PropertyState_DIRECT_VALUE; diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx index 8525d61be525..faf102bb0b6e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx @@ -30,8 +30,7 @@ public: explicit WrappedTextRotationProperty( bool bDirectState=false ); virtual ~WrappedTextRotationProperty() override; - virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override; |